You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2023/02/09 22:40:16 UTC

[nifi] 01/01: NIFI-11103 preparing support/nifi-1.x line for any subsequent feature/maint releases starting with 1.21-snap

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 8300477ed1088d7db83108263f2392c532dae1fe
Author: Joe Witt <jo...@apache.org>
AuthorDate: Thu Feb 9 15:40:01 2023 -0700

    NIFI-11103 preparing support/nifi-1.x line for any subsequent feature/maint releases starting with 1.21-snap
---
 c2/c2-client-bundle/c2-client-api/pom.xml          |   4 +-
 c2/c2-client-bundle/c2-client-base/pom.xml         |   6 +-
 c2/c2-client-bundle/c2-client-http/pom.xml         |   8 +-
 c2/c2-client-bundle/c2-client-service/pom.xml      |   8 +-
 c2/c2-client-bundle/pom.xml                        |   2 +-
 c2/c2-protocol/c2-protocol-api/pom.xml             |   4 +-
 c2/c2-protocol/c2-protocol-component-api/pom.xml   |   2 +-
 c2/c2-protocol/pom.xml                             |   2 +-
 c2/pom.xml                                         |   4 +-
 minifi/minifi-assembly/pom.xml                     |   6 +-
 minifi/minifi-bootstrap/pom.xml                    |   2 +-
 minifi/minifi-c2/minifi-c2-api/pom.xml             |   2 +-
 minifi/minifi-c2/minifi-c2-assembly/pom.xml        |   2 +-
 .../minifi-c2-cache-filesystem/pom.xml             |   2 +-
 .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml     |   2 +-
 minifi/minifi-c2/minifi-c2-cache/pom.xml           |   2 +-
 .../minifi-c2-docker/dockerhub/DockerImage.txt     |   2 +-
 .../minifi-c2-docker/dockerhub/Dockerfile          |   2 +-
 minifi/minifi-c2/minifi-c2-docker/pom.xml          |   4 +-
 .../minifi-c2/minifi-c2-integration-tests/pom.xml  |   2 +-
 minifi/minifi-c2/minifi-c2-jetty/pom.xml           |   2 +-
 .../minifi-c2-provider-cache/pom.xml               |   2 +-
 .../minifi-c2-provider-delegating/pom.xml          |   2 +-
 .../minifi-c2-provider-nifi-rest/pom.xml           |   2 +-
 .../minifi-c2-provider-util/pom.xml                |   2 +-
 minifi/minifi-c2/minifi-c2-provider/pom.xml        |   2 +-
 minifi/minifi-c2/minifi-c2-service/pom.xml         |   6 +-
 minifi/minifi-c2/pom.xml                           |   2 +-
 minifi/minifi-commons/minifi-commons-api/pom.xml   |   2 +-
 .../minifi-commons/minifi-commons-schema/pom.xml   |   2 +-
 minifi/minifi-commons/minifi-utils/pom.xml         |   2 +-
 minifi/minifi-commons/pom.xml                      |   2 +-
 minifi/minifi-docker/dockerhub/DockerImage.txt     |   2 +-
 minifi/minifi-docker/dockerhub/Dockerfile          |   2 +-
 minifi/minifi-docker/pom.xml                       |   2 +-
 minifi/minifi-docs/pom.xml                         |   2 +-
 minifi/minifi-integration-tests/pom.xml            |   2 +-
 .../minifi-framework-nar/pom.xml                   |   6 +-
 .../minifi-framework/minifi-framework-api/pom.xml  |   8 +-
 .../minifi-framework/minifi-framework-core/pom.xml |   8 +-
 .../minifi-framework/minifi-resources/pom.xml      |   2 +-
 .../minifi-framework/minifi-runtime/pom.xml        |   2 +-
 .../minifi-framework/minifi-server/pom.xml         |   2 +-
 .../minifi-framework/pom.xml                       |   2 +-
 .../minifi-server-nar/pom.xml                      |   8 +-
 .../minifi-framework-bundle/pom.xml                |  20 +-
 .../minifi-provenance-repositories/pom.xml         |   2 +-
 .../minifi-provenance-repository-nar/pom.xml       |   2 +-
 .../minifi-provenance-repository-bundle/pom.xml    |   2 +-
 .../minifi-nar-bundles/minifi-standard-nar/pom.xml |   8 +-
 .../minifi-update-attribute-nar/pom.xml            |   6 +-
 minifi/minifi-nar-bundles/pom.xml                  |   2 +-
 .../minifi-toolkit/minifi-toolkit-assembly/pom.xml |   2 +-
 .../minifi-toolkit-configuration/pom.xml           |   2 +-
 minifi/minifi-toolkit/pom.xml                      |   2 +-
 minifi/pom.xml                                     | 146 ++++-----
 nifi-api/pom.xml                                   |   2 +-
 nifi-assembly/pom.xml                              | 344 ++++++++++-----------
 nifi-bootstrap/pom.xml                             |  24 +-
 nifi-commons/nifi-bootstrap-utils/pom.xml          |   2 +-
 nifi-commons/nifi-build/pom.xml                    |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml    |   8 +-
 nifi-commons/nifi-deprecation-log/pom.xml          |   2 +-
 nifi-commons/nifi-expression-language/pom.xml      |  10 +-
 nifi-commons/nifi-external-resource-utils/pom.xml  |   4 +-
 nifi-commons/nifi-flow-encryptor/pom.xml           |   6 +-
 nifi-commons/nifi-flowfile-packager/pom.xml        |   2 +-
 nifi-commons/nifi-hashicorp-vault-api/pom.xml      |   2 +-
 nifi-commons/nifi-hashicorp-vault/pom.xml          |  10 +-
 nifi-commons/nifi-hl7-query-language/pom.xml       |   2 +-
 nifi-commons/nifi-jetty-configuration/pom.xml      |   2 +-
 nifi-commons/nifi-json-utils/pom.xml               |   4 +-
 nifi-commons/nifi-logging-utils/pom.xml            |   2 +-
 nifi-commons/nifi-metrics/pom.xml                  |   4 +-
 nifi-commons/nifi-parameter/pom.xml                |   4 +-
 nifi-commons/nifi-properties/pom.xml               |   4 +-
 nifi-commons/nifi-property-encryptor/pom.xml       |   4 +-
 nifi-commons/nifi-property-protection-api/pom.xml  |   4 +-
 nifi-commons/nifi-property-protection-aws/pom.xml  |   6 +-
 .../nifi-property-protection-azure/pom.xml         |   6 +-
 .../nifi-property-protection-cipher/pom.xml        |   4 +-
 .../nifi-property-protection-factory/pom.xml       |  22 +-
 nifi-commons/nifi-property-protection-gcp/pom.xml  |   6 +-
 .../nifi-property-protection-hashicorp/pom.xml     |   8 +-
 .../nifi-property-protection-loader/pom.xml        |   4 +-
 .../nifi-property-protection-shared/pom.xml        |   4 +-
 nifi-commons/nifi-property-utils/pom.xml           |   2 +-
 nifi-commons/nifi-record-path/pom.xml              |  10 +-
 nifi-commons/nifi-record/pom.xml                   |   2 +-
 nifi-commons/nifi-repository-encryption/pom.xml    |   8 +-
 nifi-commons/nifi-schema-utils/pom.xml             |   2 +-
 nifi-commons/nifi-security-crypto-key/pom.xml      |   2 +-
 nifi-commons/nifi-security-kerberos-api/pom.xml    |   2 +-
 nifi-commons/nifi-security-kerberos/pom.xml        |   6 +-
 nifi-commons/nifi-security-kms/pom.xml             |   2 +-
 nifi-commons/nifi-security-socket-ssl/pom.xml      |   6 +-
 nifi-commons/nifi-security-ssl/pom.xml             |   2 +-
 nifi-commons/nifi-security-utils-api/pom.xml       |   2 +-
 nifi-commons/nifi-security-utils/pom.xml           |  12 +-
 nifi-commons/nifi-single-user-utils/pom.xml        |   4 +-
 nifi-commons/nifi-site-to-site-client/pom.xml      |  18 +-
 nifi-commons/nifi-socket-utils/pom.xml             |   8 +-
 nifi-commons/nifi-utils/pom.xml                    |   4 +-
 nifi-commons/nifi-uuid5/pom.xml                    |   2 +-
 nifi-commons/nifi-web-client-api/pom.xml           |   2 +-
 nifi-commons/nifi-web-client/pom.xml               |   4 +-
 nifi-commons/nifi-web-utils/pom.xml                |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml          |   4 +-
 nifi-commons/nifi-xml-processing/pom.xml           |   2 +-
 nifi-commons/pom.xml                               |   2 +-
 nifi-docker/dockerhub/DockerImage.txt              |   2 +-
 nifi-docker/dockerhub/Dockerfile                   |   2 +-
 nifi-docker/dockerhub/pom.xml                      |   4 +-
 nifi-docker/dockermaven/pom.xml                    |   2 +-
 nifi-docker/pom.xml                                |   2 +-
 nifi-docs/pom.xml                                  |   2 +-
 .../nifi-nifi-example-nar/pom.xml                  |   2 +-
 .../nifi-nifi-example-processors/pom.xml           |   6 +-
 nifi-external/nifi-example-bundle/pom.xml          |   4 +-
 .../nifi-kafka-connector-assembly/pom.xml          |  24 +-
 .../nifi-kafka-connector-tests/pom.xml             |  10 +-
 .../nifi-kafka-connector/pom.xml                   |  24 +-
 nifi-external/nifi-kafka-connect/pom.xml           |   2 +-
 nifi-external/nifi-spark-receiver/pom.xml          |   4 +-
 nifi-external/pom.xml                              |   2 +-
 nifi-framework-api/pom.xml                         |   4 +-
 nifi-h2/nifi-h2-database-migrator/pom.xml          |   4 +-
 nifi-h2/nifi-h2-database/pom.xml                   |   2 +-
 nifi-h2/pom.xml                                    |   2 +-
 .../nifi-extension-manifest-model/pom.xml          |   2 +-
 .../nifi-extension-manifest-parser/pom.xml         |   4 +-
 nifi-manifest/nifi-runtime-manifest-core/pom.xml   |  10 +-
 nifi-manifest/nifi-runtime-manifest-test/pom.xml   |   6 +-
 nifi-manifest/nifi-runtime-manifest/pom.xml        |   6 +-
 nifi-manifest/pom.xml                              |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml        |   2 +-
 .../nifi-service-bundle-archetype/pom.xml          |   2 +-
 nifi-maven-archetypes/pom.xml                      |   2 +-
 nifi-mock/pom.xml                                  |  16 +-
 .../nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml |   8 +-
 .../nifi-accumulo-processors/pom.xml               |  20 +-
 .../nifi-accumulo-services-api-nar/pom.xml         |   8 +-
 .../nifi-accumulo-services-api/pom.xml             |  10 +-
 .../nifi-accumulo-services-nar/pom.xml             |   8 +-
 .../nifi-accumulo-services/pom.xml                 |  24 +-
 nifi-nar-bundles/nifi-accumulo-bundle/pom.xml      |   4 +-
 .../nifi-airtable-bundle/nifi-airtable-nar/pom.xml |   6 +-
 .../nifi-airtable-processors/pom.xml               |   6 +-
 nifi-nar-bundles/nifi-airtable-bundle/pom.xml      |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml     |   4 +-
 .../nifi-ambari-reporting-task/pom.xml             |  10 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml        |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml         |   4 +-
 .../nifi-amqp-bundle/nifi-amqp-processors/pom.xml  |   6 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml          |   4 +-
 .../nifi-asana-processors-nar/pom.xml              |   2 +-
 .../nifi-asana-processors/pom.xml                  |   2 +-
 .../nifi-asana-services-api-nar/pom.xml            |   2 +-
 .../nifi-asana-services-api/pom.xml                |   2 +-
 .../nifi-asana-services-nar/pom.xml                |   2 +-
 .../nifi-asana-bundle/nifi-asana-services/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-asana-bundle/pom.xml         |   2 +-
 .../nifi-asn1-bundle/nifi-asn1-nar/pom.xml         |   6 +-
 .../nifi-asn1-bundle/nifi-asn1-services/pom.xml    |   4 +-
 nifi-nar-bundles/nifi-asn1-bundle/pom.xml          |   2 +-
 .../nifi-atlas-bundle/nifi-atlas-nar/pom.xml       |   4 +-
 .../nifi-atlas-reporting-task/pom.xml              |   8 +-
 nifi-nar-bundles/nifi-atlas-bundle/pom.xml         |   4 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml         |   4 +-
 .../nifi-avro-bundle/nifi-avro-processors/pom.xml  |   6 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml          |   2 +-
 .../nifi-aws-abstract-processors/pom.xml           |   6 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml           |  10 +-
 .../nifi-aws-parameter-providers/pom.xml           |  12 +-
 .../nifi-aws-parameter-value-providers/pom.xml     |   8 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml    |  16 +-
 .../nifi-aws-service-api-nar/pom.xml               |   6 +-
 .../nifi-aws-bundle/nifi-aws-service-api/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml           |   2 +-
 .../nifi-azure-graph-authorizer/pom.xml            |   6 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml       |  12 +-
 .../nifi-azure-parameter-providers/pom.xml         |   8 +-
 .../nifi-azure-processors/pom.xml                  |  24 +-
 .../nifi-azure-reporting-task/pom.xml              |  12 +-
 .../nifi-azure-services-api-nar/pom.xml            |   6 +-
 .../nifi-azure-services-api/pom.xml                |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml         |   2 +-
 .../nifi-beats-bundle/nifi-beats-nar/pom.xml       |   6 +-
 .../nifi-beats-processors/pom.xml                  |   8 +-
 nifi-nar-bundles/nifi-beats-bundle/pom.xml         |   2 +-
 .../nifi-box-bundle/nifi-box-nar/pom.xml           |   6 +-
 .../nifi-box-bundle/nifi-box-processors/pom.xml    |  10 +-
 .../nifi-box-services-api-nar/pom.xml              |   8 +-
 .../nifi-box-bundle/nifi-box-services-api/pom.xml  |   2 +-
 .../nifi-box-bundle/nifi-box-services-nar/pom.xml  |   8 +-
 .../nifi-box-bundle/nifi-box-services/pom.xml      |   8 +-
 nifi-nar-bundles/nifi-box-bundle/pom.xml           |   2 +-
 .../pom.xml                                        |  22 +-
 .../nifi-cassandra-nar/pom.xml                     |   4 +-
 .../nifi-cassandra-processors/pom.xml              |   6 +-
 .../nifi-cassandra-services-api-nar/pom.xml        |   6 +-
 .../nifi-cassandra-services-api/pom.xml            |   2 +-
 .../nifi-cassandra-services-nar/pom.xml            |   8 +-
 .../nifi-cassandra-services/pom.xml                |  12 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml     |   4 +-
 .../nifi-ccda-bundle/nifi-ccda-nar/pom.xml         |   2 +-
 .../nifi-ccda-bundle/nifi-ccda-processors/pom.xml  |   8 +-
 nifi-nar-bundles/nifi-ccda-bundle/pom.xml          |   4 +-
 nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml     |   2 +-
 .../nifi-cdc-mysql-nar/pom.xml                     |   4 +-
 .../nifi-cdc-mysql-processors/pom.xml              |   6 +-
 .../nifi-cdc/nifi-cdc-mysql-bundle/pom.xml         |   4 +-
 nifi-nar-bundles/nifi-cdc/pom.xml                  |   2 +-
 .../nifi-cipher-bundle/nifi-cipher-nar/pom.xml     |   6 +-
 .../nifi-cipher-processors/pom.xml                 |   6 +-
 nifi-nar-bundles/nifi-cipher-bundle/pom.xml        |   2 +-
 .../nifi-confluent-platform-nar/pom.xml            |   6 +-
 .../nifi-confluent-schema-registry-service/pom.xml |   8 +-
 .../nifi-confluent-platform-bundle/pom.xml         |   2 +-
 .../nifi-couchbase-nar/pom.xml                     |   6 +-
 .../nifi-couchbase-processors/pom.xml              |   8 +-
 .../nifi-couchbase-services-api-nar/pom.xml        |   6 +-
 .../nifi-couchbase-services-api/pom.xml            |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml     |   2 +-
 .../nifi-cybersecurity-nar/pom.xml                 |   4 +-
 .../nifi-cybersecurity-processors/pom.xml          |   6 +-
 nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml |   2 +-
 .../nifi-datadog-bundle/nifi-datadog-nar/pom.xml   |   2 +-
 .../nifi-datadog-reporting-task/pom.xml            |   8 +-
 nifi-nar-bundles/nifi-datadog-bundle/pom.xml       |   4 +-
 .../nifi-dropbox-processors-nar/pom.xml            |   6 +-
 .../nifi-dropbox-processors/pom.xml                |  14 +-
 .../nifi-dropbox-services-api-nar/pom.xml          |   8 +-
 .../nifi-dropbox-services-api/pom.xml              |   2 +-
 .../nifi-dropbox-services-nar/pom.xml              |   6 +-
 .../nifi-dropbox-services/pom.xml                  |   6 +-
 nifi-nar-bundles/nifi-dropbox-bundle/pom.xml       |   4 +-
 .../nifi-easyrules-nar/pom.xml                     |   6 +-
 .../nifi-easyrules-service/pom.xml                 |   8 +-
 nifi-nar-bundles/nifi-easyrules-bundle/pom.xml     |   4 +-
 .../pom.xml                                        |   6 +-
 .../nifi-elasticsearch-client-service-api/pom.xml  |  10 +-
 .../nifi-elasticsearch-client-service-nar/pom.xml  |   6 +-
 .../nifi-elasticsearch-client-service/pom.xml      |  28 +-
 .../nifi-elasticsearch-nar/pom.xml                 |   4 +-
 .../nifi-elasticsearch-processors/pom.xml          |  16 +-
 .../nifi-elasticsearch-restapi-nar/pom.xml         |   6 +-
 .../nifi-elasticsearch-restapi-processors/pom.xml  |  32 +-
 .../nifi-elasticsearch-test-utils/pom.xml          |   4 +-
 nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml |   6 +-
 .../nifi-email-bundle/nifi-email-nar/pom.xml       |   4 +-
 .../nifi-email-processors/pom.xml                  |   8 +-
 nifi-nar-bundles/nifi-email-bundle/pom.xml         |   4 +-
 .../nifi-enrich-bundle/nifi-enrich-nar/pom.xml     |   2 +-
 .../nifi-enrich-processors/pom.xml                 |  12 +-
 nifi-nar-bundles/nifi-enrich-bundle/pom.xml        |   4 +-
 .../nifi-evtx-bundle/nifi-evtx-nar/pom.xml         |   4 +-
 .../nifi-evtx-bundle/nifi-evtx-processors/pom.xml  |   8 +-
 nifi-nar-bundles/nifi-evtx-bundle/pom.xml          |   4 +-
 .../nifi-extension-utils/nifi-bin-manager/pom.xml  |   4 +-
 .../nifi-conflict-resolution/pom.xml               |   2 +-
 .../nifi-database-test-utils/pom.xml               |   2 +-
 .../nifi-database-utils/pom.xml                    |   8 +-
 .../nifi-extension-utils/nifi-dbcp-base/pom.xml    |   4 +-
 .../nifi-extension-utils/nifi-event-listen/pom.xml |   8 +-
 .../nifi-extension-utils/nifi-event-put/pom.xml    |   6 +-
 .../nifi-event-transport/pom.xml                   |   6 +-
 .../nifi-extension-utils/nifi-hadoop-utils/pom.xml |   6 +-
 .../nifi-kerberos-test-utils/pom.xml               |   8 +-
 .../nifi-listed-entity/pom.xml                     |   4 +-
 .../nifi-prometheus-utils/pom.xml                  |   8 +-
 .../nifi-extension-utils/nifi-put-pattern/pom.xml  |   4 +-
 .../nifi-avro-record-utils/pom.xml                 |   6 +-
 .../nifi-hadoop-record-utils/pom.xml               |   6 +-
 .../nifi-json-record-utils/pom.xml                 |   6 +-
 .../nifi-mock-record-utils/pom.xml                 |   6 +-
 .../nifi-standard-record-utils/pom.xml             |   8 +-
 .../nifi-extension-utils/nifi-record-utils/pom.xml |   2 +-
 .../nifi-reporting-utils/pom.xml                   |   6 +-
 .../nifi-service-utils/pom.xml                     |   6 +-
 .../nifi-extension-utils/nifi-syslog-utils/pom.xml |   6 +-
 nifi-nar-bundles/nifi-extension-utils/pom.xml      |   2 +-
 .../nifi-flow-registry-client-nar/pom.xml          |   6 +-
 .../nifi-flow-registry-client-services/pom.xml     |  10 +-
 .../nifi-flow-registry-client-bundle/pom.xml       |   2 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml       |   4 +-
 .../nifi-flume-processors/pom.xml                  |   8 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml         |   4 +-
 .../nifi-framework-external-resource-utils/pom.xml |   2 +-
 .../nifi-framework-nar/pom.xml                     |   8 +-
 .../nifi-framework/nifi-administration/pom.xml     |   4 +-
 .../nifi-framework/nifi-authorizer/pom.xml         |   4 +-
 .../nifi-framework/nifi-client-dto/pom.xml         |   6 +-
 .../nifi-framework/nifi-documentation/pom.xml      |   2 +-
 .../nifi-framework/nifi-file-authorizer/pom.xml    |   4 +-
 .../nifi-flowfile-repo-serialization/pom.xml       |  12 +-
 .../nifi-framework-authorization-providers/pom.xml |  10 +-
 .../nifi-framework-authorization/pom.xml           |   4 +-
 .../nifi-framework-cluster-protocol/pom.xml        |  10 +-
 .../nifi-framework/nifi-framework-cluster/pom.xml  |   2 +-
 .../nifi-framework-components/pom.xml              |  28 +-
 .../nifi-framework/nifi-framework-core-api/pom.xml |   8 +-
 .../nifi-framework/nifi-framework-core/pom.xml     |  34 +-
 .../nifi-framework-nar-loading-utils/pom.xml       |   2 +-
 .../nifi-framework-nar-utils/pom.xml               |   4 +-
 .../nifi-framework/nifi-headless-server/pom.xml    |   2 +-
 .../nifi-framework/nifi-mock-authorizer/pom.xml    |   2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml          |   2 +-
 .../nifi-framework/nifi-properties-loader/pom.xml  |   2 +-
 .../nifi-framework/nifi-repository-models/pom.xml  |   6 +-
 .../nifi-framework/nifi-resources/pom.xml          |   2 +-
 .../nifi-framework/nifi-runtime/pom.xml            |   2 +-
 .../nifi-framework/nifi-shell-authorizer/pom.xml   |   4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml       |   4 +-
 .../nifi-standard-prioritizers/pom.xml             |   2 +-
 .../nifi-framework/nifi-user-actions/pom.xml       |   2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml      |   2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml     |   2 +-
 .../nifi-web/nifi-ui-extension/pom.xml             |   2 +-
 .../nifi-framework/nifi-web/nifi-web-api/pom.xml   |   6 +-
 .../nifi-web/nifi-web-content-access/pom.xml       |   2 +-
 .../nifi-web/nifi-web-content-viewer/pom.xml       |   2 +-
 .../nifi-framework/nifi-web/nifi-web-docs/pom.xml  |   2 +-
 .../nifi-framework/nifi-web/nifi-web-error/pom.xml |   2 +-
 .../nifi-web/nifi-web-optimistic-locking/pom.xml   |   2 +-
 .../nifi-web/nifi-web-security/pom.xml             |   2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml    |   2 +-
 .../nifi-framework/nifi-web/pom.xml                |  12 +-
 .../nifi-framework-bundle/nifi-framework/pom.xml   |   2 +-
 .../nifi-headless-server-nar/pom.xml               |   6 +-
 .../nifi-framework-bundle/nifi-server-nar/pom.xml  |   6 +-
 nifi-nar-bundles/nifi-framework-bundle/pom.xml     |  80 ++---
 .../nifi-gcp-bundle/nifi-gcp-nar/pom.xml           |   8 +-
 .../nifi-gcp-parameter-providers/pom.xml           |  10 +-
 .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml    |  12 +-
 .../nifi-gcp-services-api-nar/pom.xml              |   6 +-
 .../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-gcp-bundle/pom.xml           |   2 +-
 .../nifi-geohash-bundle/nifi-geohash-nar/pom.xml   |   4 +-
 .../nifi-geohash-processors/pom.xml                |  12 +-
 nifi-nar-bundles/nifi-geohash-bundle/pom.xml       |   2 +-
 .../nifi-graph-client-service-api-nar/pom.xml      |   6 +-
 .../nifi-graph-client-service-api/pom.xml          |   4 +-
 .../nifi-graph-bundle/nifi-graph-nar/pom.xml       |   4 +-
 .../nifi-graph-processors/pom.xml                  |  22 +-
 .../nifi-graph-test-clients/pom.xml                |   6 +-
 .../nifi-neo4j-3-cypher-service-nar/pom.xml        |   6 +-
 .../nifi-neo4j-3-cypher-service/pom.xml            |  10 +-
 .../nifi-neo4j-cypher-service-nar/pom.xml          |   6 +-
 .../nifi-neo4j-cypher-service/pom.xml              |  12 +-
 .../nifi-other-graph-services-nar/pom.xml          |   6 +-
 .../nifi-other-graph-services/pom.xml              |  10 +-
 nifi-nar-bundles/nifi-graph-bundle/pom.xml         |   4 +-
 .../nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml   |   4 +-
 .../nifi-groovyx-processors/pom.xml                |  14 +-
 nifi-nar-bundles/nifi-groovyx-bundle/pom.xml       |   4 +-
 .../nifi-grpc-bundle/nifi-grpc-nar/pom.xml         |   6 +-
 .../nifi-grpc-bundle/nifi-grpc-processors/pom.xml  |  10 +-
 nifi-nar-bundles/nifi-grpc-bundle/pom.xml          |   4 +-
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml     |   4 +-
 .../nifi-hdfs-processors/pom.xml                   |  12 +-
 nifi-nar-bundles/nifi-hadoop-bundle/pom.xml        |   4 +-
 .../nifi-hadoop-libraries-nar/pom.xml              |   4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml           |   2 +-
 .../pom.xml                                        |   6 +-
 .../pom.xml                                        |  10 +-
 .../nifi-hashicorp-vault-client-service/pom.xml    |  12 +-
 .../nifi-hashicorp-vault-nar/pom.xml               |  12 +-
 .../pom.xml                                        |   8 +-
 .../pom.xml                                        |  10 +-
 .../nifi-hashicorp-vault-bundle/pom.xml            |   2 +-
 .../nifi-hazelcast-services-api-nar/pom.xml        |   6 +-
 .../nifi-hazelcast-services-api/pom.xml            |   2 +-
 .../nifi-hazelcast-services-nar/pom.xml            |   6 +-
 .../nifi-hazelcast-services/pom.xml                |   8 +-
 nifi-nar-bundles/nifi-hazelcast-bundle/pom.xml     |   2 +-
 .../nifi-hbase-bundle/nifi-hbase-nar/pom.xml       |   4 +-
 .../nifi-hbase-processors/pom.xml                  |  14 +-
 nifi-nar-bundles/nifi-hbase-bundle/pom.xml         |   4 +-
 .../nifi-hive-bundle/nifi-hive-nar/pom.xml         |   6 +-
 .../nifi-hive-bundle/nifi-hive-processors/pom.xml  |  22 +-
 .../nifi-hive-services-api-nar/pom.xml             |   6 +-
 .../nifi-hive-services-api/pom.xml                 |   6 +-
 .../nifi-hive-bundle/nifi-hive-test-utils/pom.xml  |   2 +-
 .../nifi-hive-bundle/nifi-hive3-nar/pom.xml        |   6 +-
 .../nifi-hive-bundle/nifi-hive3-processors/pom.xml |  30 +-
 .../nifi-hive-bundle/nifi-hive_1_1-nar/pom.xml     |   6 +-
 .../nifi-hive_1_1-processors/pom.xml               |  22 +-
 nifi-nar-bundles/nifi-hive-bundle/pom.xml          |   4 +-
 .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml           |   4 +-
 .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml    |   6 +-
 nifi-nar-bundles/nifi-hl7-bundle/pom.xml           |   6 +-
 .../nifi-html-bundle/nifi-html-nar/pom.xml         |   4 +-
 .../nifi-html-bundle/nifi-html-processors/pom.xml  |   6 +-
 nifi-nar-bundles/nifi-html-bundle/pom.xml          |   4 +-
 .../nifi-hubspot-bundle/nifi-hubspot-nar/pom.xml   |   6 +-
 .../nifi-hubspot-processors/pom.xml                |  10 +-
 nifi-nar-bundles/nifi-hubspot-bundle/pom.xml       |   2 +-
 .../nifi-iceberg-processors-nar/pom.xml            |   6 +-
 .../nifi-iceberg-processors/pom.xml                |  18 +-
 .../nifi-iceberg-services-api-nar/pom.xml          |   6 +-
 .../nifi-iceberg-services-api/pom.xml              |   2 +-
 .../nifi-iceberg-services-nar/pom.xml              |   6 +-
 .../nifi-iceberg-services/pom.xml                  |   6 +-
 nifi-nar-bundles/nifi-iceberg-bundle/pom.xml       |   2 +-
 .../nifi-ignite-bundle/nifi-ignite-nar/pom.xml     |   4 +-
 .../nifi-ignite-processors/pom.xml                 |   6 +-
 nifi-nar-bundles/nifi-ignite-bundle/pom.xml        |   4 +-
 .../nifi-influxdb-bundle/nifi-influxdb-nar/pom.xml |   4 +-
 .../nifi-influxdb-processors/pom.xml               |   6 +-
 nifi-nar-bundles/nifi-influxdb-bundle/pom.xml      |   4 +-
 .../nifi-iotdb-bundle/nifi-iotdb-nar/pom.xml       |   2 +-
 .../nifi-iotdb-processors/pom.xml                  |   2 +-
 nifi-nar-bundles/nifi-iotdb-bundle/pom.xml         |   2 +-
 nifi-nar-bundles/nifi-jetty-bundle/pom.xml         |   2 +-
 .../nifi-jms-cf-service-nar/pom.xml                |   6 +-
 .../nifi-jms-bundle/nifi-jms-cf-service/pom.xml    |   2 +-
 .../nifi-jms-processors-nar/pom.xml                |   6 +-
 .../nifi-jms-bundle/nifi-jms-processors/pom.xml    |   8 +-
 nifi-nar-bundles/nifi-jms-bundle/pom.xml           |   2 +-
 .../nifi-jolt-record-nar/pom.xml                   |   6 +-
 .../nifi-jolt-record-processors/pom.xml            |  14 +-
 nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml   |   8 +-
 .../nifi-jslt-bundle/nifi-jslt-nar/pom.xml         |   4 +-
 .../nifi-jslt-bundle/nifi-jslt-processors/pom.xml  |   6 +-
 nifi-nar-bundles/nifi-jslt-bundle/pom.xml          |   4 +-
 .../nifi-kafka-bundle/nifi-kafka-1-0-nar/pom.xml   |   4 +-
 .../nifi-kafka-1-0-processors/pom.xml              |  14 +-
 .../nifi-kafka-bundle/nifi-kafka-2-0-nar/pom.xml   |   4 +-
 .../nifi-kafka-2-0-processors/pom.xml              |  14 +-
 .../nifi-kafka-bundle/nifi-kafka-2-6-nar/pom.xml   |   4 +-
 .../nifi-kafka-2-6-processors/pom.xml              |  18 +-
 .../nifi-kafka-bundle/nifi-kafka-shared/pom.xml    |   4 +-
 nifi-nar-bundles/nifi-kafka-bundle/pom.xml         |  10 +-
 .../nifi-kerberos-iaa-providers-nar/pom.xml        |   2 +-
 .../nifi-kerberos-iaa-providers/pom.xml            |   4 +-
 .../nifi-kerberos-iaa-providers-bundle/pom.xml     |   4 +-
 .../nifi-kudu-controller-service/pom.xml           |   6 +-
 .../nifi-kudu-bundle/nifi-kudu-nar/pom.xml         |   8 +-
 .../nifi-kudu-bundle/nifi-kudu-processors/pom.xml  |  16 +-
 nifi-nar-bundles/nifi-kudu-bundle/pom.xml          |   2 +-
 .../nifi-language-translation-nar/pom.xml          |   4 +-
 .../nifi-yandex-processors/pom.xml                 |   8 +-
 .../nifi-language-translation-bundle/pom.xml       |   2 +-
 .../nifi-ldap-iaa-providers-nar/pom.xml            |   2 +-
 .../nifi-ldap-iaa-providers/pom.xml                |   8 +-
 .../nifi-ldap-iaa-providers-bundle/pom.xml         |   4 +-
 .../nifi-media-bundle/nifi-image-viewer/pom.xml    |   2 +-
 .../nifi-media-bundle/nifi-media-nar/pom.xml       |   6 +-
 .../nifi-media-processors/pom.xml                  |   6 +-
 nifi-nar-bundles/nifi-media-bundle/pom.xml         |   2 +-
 .../nifi-metrics-reporter-service-api-nar/pom.xml  |   6 +-
 .../nifi-metrics-reporter-service-api/pom.xml      |   2 +-
 .../nifi-metrics-reporting-nar/pom.xml             |   6 +-
 .../nifi-metrics-reporting-task/pom.xml            |   8 +-
 .../nifi-metrics-reporting-bundle/pom.xml          |   6 +-
 .../nifi-mongodb-client-service-api-nar/pom.xml    |   6 +-
 .../nifi-mongodb-client-service-api/pom.xml        |   4 +-
 .../nifi-mongodb-bundle/nifi-mongodb-nar/pom.xml   |   4 +-
 .../nifi-mongodb-processors/pom.xml                |  18 +-
 .../nifi-mongodb-services-nar/pom.xml              |   6 +-
 .../nifi-mongodb-services/pom.xml                  |  10 +-
 nifi-nar-bundles/nifi-mongodb-bundle/pom.xml       |   4 +-
 .../nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml         |   4 +-
 .../nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml  |  10 +-
 nifi-nar-bundles/nifi-mqtt-bundle/pom.xml          |   4 +-
 .../nifi-network-processors-nar/pom.xml            |   4 +-
 .../nifi-network-processors/pom.xml                |   8 +-
 .../nifi-network-bundle/nifi-network-utils/pom.xml |   2 +-
 nifi-nar-bundles/nifi-network-bundle/pom.xml       |   2 +-
 .../nifi-parquet-bundle/nifi-parquet-nar/pom.xml   |   6 +-
 .../nifi-parquet-processors/pom.xml                |  10 +-
 nifi-nar-bundles/nifi-parquet-bundle/pom.xml       |   2 +-
 .../nifi-pgp-bundle/nifi-pgp-nar/pom.xml           |   6 +-
 .../nifi-pgp-bundle/nifi-pgp-processors/pom.xml    |   8 +-
 .../nifi-pgp-service-api-nar/pom.xml               |   6 +-
 .../nifi-pgp-bundle/nifi-pgp-service-api/pom.xml   |   2 +-
 .../nifi-pgp-bundle/nifi-pgp-service-nar/pom.xml   |   6 +-
 .../nifi-pgp-bundle/nifi-pgp-service/pom.xml       |   8 +-
 .../nifi-pgp-bundle/nifi-pgp-test-utils/pom.xml    |   2 +-
 nifi-nar-bundles/nifi-pgp-bundle/pom.xml           |   2 +-
 .../nifi-poi-bundle/nifi-poi-nar/pom.xml           |   4 +-
 .../nifi-poi-bundle/nifi-poi-processors/pom.xml    |   8 +-
 nifi-nar-bundles/nifi-poi-bundle/pom.xml           |   2 +-
 .../nifi-prometheus-nar/pom.xml                    |   6 +-
 .../nifi-prometheus-reporting-task/pom.xml         |  14 +-
 nifi-nar-bundles/nifi-prometheus-bundle/pom.xml    |   2 +-
 .../nifi-persistent-provenance-repository/pom.xml  |  20 +-
 .../nifi-provenance-repository-nar/pom.xml         |   2 +-
 .../nifi-volatile-provenance-repository/pom.xml    |   6 +-
 .../nifi-provenance-repository-bundle/pom.xml      |   6 +-
 .../nifi-ranger-bundle/nifi-ranger-nar/pom.xml     |   4 +-
 .../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml  |   6 +-
 .../nifi-ranger-resources/pom.xml                  |   2 +-
 nifi-nar-bundles/nifi-ranger-bundle/pom.xml        |   2 +-
 .../nifi-redis-extensions/pom.xml                  |   8 +-
 .../nifi-redis-bundle/nifi-redis-nar/pom.xml       |   6 +-
 .../nifi-redis-service-api-nar/pom.xml             |   6 +-
 .../nifi-redis-service-api/pom.xml                 |   2 +-
 nifi-nar-bundles/nifi-redis-bundle/pom.xml         |   2 +-
 .../nifi-registry-bundle/nifi-registry-nar/pom.xml |   6 +-
 .../nifi-registry-service/pom.xml                  |   6 +-
 nifi-nar-bundles/nifi-registry-bundle/pom.xml      |   2 +-
 .../nifi-rethinkdb-nar/pom.xml                     |   4 +-
 .../nifi-rethinkdb-processors/pom.xml              |   8 +-
 nifi-nar-bundles/nifi-rethinkdb-bundle/pom.xml     |   4 +-
 .../nifi-riemann-bundle/nifi-riemann-nar/pom.xml   |   2 +-
 .../nifi-riemann-processors/pom.xml                |   6 +-
 nifi-nar-bundles/nifi-riemann-bundle/pom.xml       |   4 +-
 .../nifi-rocksdb-bundle/nifi-rocksdb-nar/pom.xml   |   6 +-
 .../nifi-rocksdb-repository/pom.xml                |   8 +-
 nifi-nar-bundles/nifi-rocksdb-bundle/pom.xml       |   2 +-
 .../nifi-rules-action-handler-nar/pom.xml          |   6 +-
 .../nifi-rules-action-handler-service/pom.xml      |  12 +-
 .../nifi-rules-action-handler-bundle/pom.xml       |   4 +-
 .../nifi-salesforce-nar/pom.xml                    |   6 +-
 .../nifi-salesforce-processors/pom.xml             |  10 +-
 nifi-nar-bundles/nifi-salesforce-bundle/pom.xml    |   2 +-
 .../nifi-scripting-nar/pom.xml                     |   4 +-
 .../nifi-scripting-processors/pom.xml              |  12 +-
 nifi-nar-bundles/nifi-scripting-bundle/pom.xml     |  14 +-
 .../nifi-shopify-bundle/nifi-shopify-nar/pom.xml   |   6 +-
 .../nifi-shopify-processors/pom.xml                |  10 +-
 nifi-nar-bundles/nifi-shopify-bundle/pom.xml       |   2 +-
 .../nifi-single-user-iaa-providers-nar/pom.xml     |   2 +-
 .../nifi-single-user-iaa-providers/pom.xml         |  10 +-
 .../nifi-single-user-iaa-providers-bundle/pom.xml  |   4 +-
 .../nifi-site-to-site-reporting-nar/pom.xml        |   4 +-
 .../nifi-site-to-site-reporting-task/pom.xml       |  18 +-
 .../nifi-site-to-site-reporting-bundle/pom.xml     |   4 +-
 .../nifi-slack-bundle/nifi-slack-nar/pom.xml       |   4 +-
 .../nifi-slack-processors/pom.xml                  |   6 +-
 nifi-nar-bundles/nifi-slack-bundle/pom.xml         |   2 +-
 .../nifi-smb-client-api-nar/pom.xml                |   6 +-
 .../nifi-smb-bundle/nifi-smb-client-api/pom.xml    |   6 +-
 .../nifi-smb-bundle/nifi-smb-nar/pom.xml           |   6 +-
 .../nifi-smb-bundle/nifi-smb-processors/pom.xml    |  12 +-
 .../nifi-smb-smbj-client-nar/pom.xml               |   6 +-
 .../nifi-smb-bundle/nifi-smb-smbj-client/pom.xml   |  10 +-
 .../nifi-smb-bundle/nifi-smb-smbj-common/pom.xml   |   6 +-
 nifi-nar-bundles/nifi-smb-bundle/pom.xml           |   4 +-
 .../nifi-snmp-bundle/nifi-snmp-nar/pom.xml         |   2 +-
 .../nifi-snmp-bundle/nifi-snmp-processors/pom.xml  |   8 +-
 nifi-nar-bundles/nifi-snmp-bundle/pom.xml          |   4 +-
 .../nifi-snowflake-processors-nar/pom.xml          |   6 +-
 .../nifi-snowflake-processors/pom.xml              |  18 +-
 .../nifi-snowflake-services-api-nar/pom.xml        |   6 +-
 .../nifi-snowflake-services-api/pom.xml            |   4 +-
 .../nifi-snowflake-services-nar/pom.xml            |   6 +-
 .../nifi-snowflake-services/pom.xml                |  16 +-
 nifi-nar-bundles/nifi-snowflake-bundle/pom.xml     |   2 +-
 .../nifi-social-media-nar/pom.xml                  |   4 +-
 .../nifi-twitter-processors/pom.xml                |   6 +-
 nifi-nar-bundles/nifi-social-media-bundle/pom.xml  |   2 +-
 .../nifi-solr-bundle/nifi-solr-nar/pom.xml         |   6 +-
 .../nifi-solr-bundle/nifi-solr-processors/pom.xml  |  14 +-
 nifi-nar-bundles/nifi-solr-bundle/pom.xml          |   2 +-
 .../nifi-livy-controller-service-api-nar/pom.xml   |   6 +-
 .../nifi-livy-controller-service-api/pom.xml       |   2 +-
 .../nifi-livy-controller-service/pom.xml           |   6 +-
 .../nifi-spark-bundle/nifi-livy-nar/pom.xml        |   8 +-
 .../nifi-spark-bundle/nifi-livy-processors/pom.xml |  10 +-
 nifi-nar-bundles/nifi-spark-bundle/pom.xml         |   4 +-
 .../nifi-splunk-bundle/nifi-splunk-nar/pom.xml     |   6 +-
 .../nifi-splunk-processors/pom.xml                 |   8 +-
 nifi-nar-bundles/nifi-splunk-bundle/pom.xml        |   2 +-
 .../nifi-spring-bundle/nifi-spring-nar/pom.xml     |   2 +-
 .../nifi-spring-processors/pom.xml                 |   6 +-
 nifi-nar-bundles/nifi-spring-bundle/pom.xml        |   4 +-
 .../nifi-sql-reporting-nar/pom.xml                 |   6 +-
 .../nifi-sql-reporting-tasks/pom.xml               |  20 +-
 nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml |   4 +-
 .../nifi-jolt-transform-json-ui/pom.xml            |  14 +-
 .../nifi-standard-content-viewer/pom.xml           |   6 +-
 .../nifi-standard-bundle/nifi-standard-nar/pom.xml |   4 +-
 .../nifi-standard-parameter-providers/pom.xml      |   6 +-
 .../nifi-standard-processors/pom.xml               |  54 ++--
 .../nifi-standard-reporting-tasks/pom.xml          |   8 +-
 .../nifi-standard-utils/pom.xml                    |   4 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml      |  14 +-
 .../nifi-dbcp-service-api/pom.xml                  |   4 +-
 .../nifi-dbcp-service-nar/pom.xml                  |   8 +-
 .../nifi-dbcp-service/pom.xml                      |  20 +-
 .../nifi-hikari-dbcp-service/pom.xml               |  12 +-
 .../nifi-dbcp-service-bundle/pom.xml               |   2 +-
 .../pom.xml                                        |   2 +-
 .../nifi-distributed-cache-client-service/pom.xml  |  10 +-
 .../nifi-distributed-cache-protocol/pom.xml        |   4 +-
 .../nifi-distributed-cache-server/pom.xml          |  14 +-
 .../nifi-distributed-cache-services-nar/pom.xml    |   4 +-
 .../nifi-distributed-cache-services-bundle/pom.xml |   2 +-
 .../nifi-hadoop-dbcp-service-nar/pom.xml           |   6 +-
 .../nifi-hadoop-dbcp-service/pom.xml               |  16 +-
 .../nifi-hadoop-dbcp-service-bundle/pom.xml        |   2 +-
 .../nifi-hbase-client-service-api/pom.xml          |   2 +-
 .../nifi-hbase_1_1_2-client-service-nar/pom.xml    |   6 +-
 .../nifi-hbase_1_1_2-client-service/pom.xml        |  12 +-
 .../nifi-hbase_1_1_2-client-service-bundle/pom.xml |   2 +-
 .../nifi-hbase_2-client-service-nar/pom.xml        |   6 +-
 .../nifi-hbase_2-client-service/pom.xml            |  12 +-
 .../nifi-hbase_2-client-service-bundle/pom.xml     |   2 +-
 .../nifi-http-context-map-api/pom.xml              |   2 +-
 .../nifi-http-context-map-nar/pom.xml              |   4 +-
 .../nifi-http-context-map/pom.xml                  |   4 +-
 .../nifi-http-context-map-bundle/pom.xml           |   2 +-
 .../nifi-hwx-schema-registry-nar/pom.xml           |   6 +-
 .../nifi-hwx-schema-registry-service/pom.xml       |  10 +-
 .../nifi-hwx-schema-registry-bundle/pom.xml        |   2 +-
 .../nifi-kerberos-credentials-service-api/pom.xml  |   2 +-
 .../nifi-kerberos-credentials-service-nar/pom.xml  |   6 +-
 .../nifi-kerberos-credentials-service/pom.xml      |   4 +-
 .../pom.xml                                        |   2 +-
 .../nifi-kerberos-user-service-api/pom.xml         |   4 +-
 .../nifi-kerberos-user-service-nar/pom.xml         |   6 +-
 .../nifi-kerberos-user-service/pom.xml             |   6 +-
 .../nifi-kerberos-user-service-bundle/pom.xml      |   2 +-
 .../nifi-key-service-api/pom.xml                   |   2 +-
 .../nifi-key-service-nar/pom.xml                   |   6 +-
 .../nifi-key-service/pom.xml                       |   8 +-
 .../nifi-key-service-bundle/pom.xml                |   2 +-
 .../nifi-load-distribution-service-api/pom.xml     |   2 +-
 .../nifi-lookup-service-api/pom.xml                |   2 +-
 .../nifi-lookup-services-nar/pom.xml               |   6 +-
 .../nifi-lookup-services/pom.xml                   |  18 +-
 .../nifi-lookup-services-bundle/pom.xml            |   2 +-
 .../nifi-oauth2-provider-api/pom.xml               |   2 +-
 .../nifi-oauth2-provider-nar/pom.xml               |   6 +-
 .../nifi-oauth2-provider-service/pom.xml           |   8 +-
 .../nifi-oauth2-provider-bundle/pom.xml            |   2 +-
 .../nifi-proxy-configuration-api/pom.xml           |   4 +-
 .../nifi-proxy-configuration-nar/pom.xml           |   6 +-
 .../nifi-proxy-configuration/pom.xml               |   4 +-
 .../nifi-proxy-configuration-bundle/pom.xml        |   2 +-
 .../nifi-record-serialization-service-api/pom.xml  |   2 +-
 .../nifi-record-serialization-services-nar/pom.xml |   6 +-
 .../nifi-record-serialization-services/pom.xml     |  14 +-
 .../pom.xml                                        |   2 +-
 .../nifi-record-sink-api/pom.xml                   |   2 +-
 .../nifi-record-sink-service-nar/pom.xml           |   6 +-
 .../nifi-record-sink-service/pom.xml               |   8 +-
 .../nifi-record-sink-service-bundle/pom.xml        |   2 +-
 .../nifi-rules-engine-service-api/pom.xml          |   4 +-
 .../nifi-schema-registry-service-api/pom.xml       |   2 +-
 .../nifi-ssl-context-service-nar/pom.xml           |   4 +-
 .../nifi-ssl-context-service/pom.xml               |   6 +-
 .../nifi-ssl-context-bundle/pom.xml                |   2 +-
 .../nifi-ssl-context-service-api/pom.xml           |   4 +-
 .../nifi-standard-services-api-nar/pom.xml         |  18 +-
 .../nifi-web-client-provider-api/pom.xml           |   4 +-
 .../nifi-web-client-provider-service-nar/pom.xml   |   6 +-
 .../nifi-web-client-provider-service/pom.xml       |  12 +-
 .../nifi-web-client-provider-bundle/pom.xml        |   2 +-
 nifi-nar-bundles/nifi-standard-services/pom.xml    |   2 +-
 .../nifi-stateful-analysis-nar/pom.xml             |   4 +-
 .../nifi-stateful-analysis-processors/pom.xml      |   6 +-
 .../nifi-stateful-analysis-bundle/pom.xml          |   4 +-
 .../nifi-stateless-processor-nar/pom.xml           |   6 +-
 .../nifi-stateless-processor-tests/pom.xml         |  32 +-
 .../nifi-stateless-processor/pom.xml               |  16 +-
 .../nifi-stateless-processor-bundle/pom.xml        |   2 +-
 .../nifi-tcp-bundle/nifi-tcp-nar/pom.xml           |   4 +-
 .../nifi-tcp-bundle/nifi-tcp-processors/pom.xml    |   6 +-
 nifi-nar-bundles/nifi-tcp-bundle/pom.xml           |   2 +-
 .../nifi-update-attribute-model/pom.xml            |   4 +-
 .../nifi-update-attribute-nar/pom.xml              |   6 +-
 .../nifi-update-attribute-processor/pom.xml        |   6 +-
 .../nifi-update-attribute-ui/pom.xml               |   8 +-
 .../nifi-update-attribute-bundle/pom.xml           |   8 +-
 .../nifi-websocket-processors-nar/pom.xml          |   6 +-
 .../nifi-websocket-processors/pom.xml              |  10 +-
 .../nifi-websocket-services-api-nar/pom.xml        |   6 +-
 .../nifi-websocket-services-api/pom.xml            |   4 +-
 .../nifi-websocket-services-jetty-nar/pom.xml      |   6 +-
 .../nifi-websocket-services-jetty/pom.xml          |   8 +-
 nifi-nar-bundles/nifi-websocket-bundle/pom.xml     |   2 +-
 .../nifi-windows-event-log-nar/pom.xml             |   4 +-
 .../nifi-windows-event-log-processors/pom.xml      |   6 +-
 .../nifi-windows-event-log-bundle/pom.xml          |   4 +-
 .../nifi-workday-processors-nar/pom.xml            |   6 +-
 .../nifi-workday-processors/pom.xml                |  22 +-
 nifi-nar-bundles/nifi-workday-bundle/pom.xml       |   2 +-
 .../nifi-zendesk-bundle/nifi-zendesk-nar/pom.xml   |   6 +-
 .../nifi-zendesk-processors/pom.xml                |   8 +-
 nifi-nar-bundles/nifi-zendesk-bundle/pom.xml       |   2 +-
 nifi-nar-bundles/pom.xml                           |  70 ++---
 nifi-registry/nifi-registry-assembly/pom.xml       |  12 +-
 .../nifi-registry-bootstrap/pom.xml                |   8 +-
 .../nifi-registry-bundle-utils/pom.xml             |   6 +-
 .../nifi-registry-client/pom.xml                   |   8 +-
 .../nifi-registry-data-model/pom.xml               |   8 +-
 .../nifi-registry-docker/dockerhub/Dockerfile      |   2 +-
 .../nifi-registry-docker/pom.xml                   |   2 +-
 .../nifi-registry-core/nifi-registry-docs/pom.xml  |   4 +-
 .../nifi-registry-flow-diff/pom.xml                |   4 +-
 .../nifi-registry-framework/pom.xml                |  22 +-
 .../nifi-registry-core/nifi-registry-jetty/pom.xml |  12 +-
 .../nifi-registry-properties-loader/pom.xml        |   2 +-
 .../nifi-registry-properties/pom.xml               |   2 +-
 .../nifi-registry-provider-api/pom.xml             |   2 +-
 .../nifi-registry-resources/pom.xml                |   2 +-
 .../nifi-registry-revision-api/pom.xml             |   2 +-
 .../nifi-registry-revision-common/pom.xml          |   4 +-
 .../nifi-registry-revision-entity-model/pom.xml    |   2 +-
 .../nifi-registry-revision-entity-service/pom.xml  |   6 +-
 .../nifi-registry-revision-spring-jdbc/pom.xml     |   6 +-
 .../nifi-registry-revision/pom.xml                 |   2 +-
 .../nifi-registry-runtime/pom.xml                  |   8 +-
 .../nifi-registry-security-api/pom.xml             |   2 +-
 .../nifi-registry-security-utils/pom.xml           |   2 +-
 .../nifi-registry-core/nifi-registry-test/pom.xml  |   2 +-
 .../nifi-registry-core/nifi-registry-utils/pom.xml |   2 +-
 .../nifi-registry-web-api/pom.xml                  |  20 +-
 .../nifi-registry-web-docs/pom.xml                 |   4 +-
 .../nifi-registry-web-ui/pom.xml                   |   4 +-
 nifi-registry/nifi-registry-core/pom.xml           |   2 +-
 .../dockermaven/Dockerfile                         |   2 +-
 .../nifi-registry-docker-maven/dockermaven/pom.xml |   2 +-
 nifi-registry/nifi-registry-docker-maven/pom.xml   |   2 +-
 .../nifi-registry-aws-assembly/pom.xml             |   4 +-
 .../nifi-registry-aws-extensions/pom.xml           |   2 +-
 .../nifi-registry-aws/pom.xml                      |   2 +-
 .../nifi-registry-ranger-assembly/pom.xml          |   4 +-
 .../nifi-registry-ranger-jersey-bundle/pom.xml     |   2 +-
 .../nifi-registry-ranger-plugin/pom.xml            |  12 +-
 .../nifi-registry-ranger/pom.xml                   |   2 +-
 nifi-registry/nifi-registry-extensions/pom.xml     |   2 +-
 .../nifi-registry-toolkit-assembly/pom.xml         |   4 +-
 .../nifi-registry-toolkit-persistence/pom.xml      |  10 +-
 nifi-registry/nifi-registry-toolkit/pom.xml        |   2 +-
 nifi-registry/pom.xml                              |  28 +-
 nifi-server-api/pom.xml                            |   8 +-
 nifi-stateless/nifi-stateless-api/pom.xml          |   4 +-
 nifi-stateless/nifi-stateless-assembly/pom.xml     |  20 +-
 nifi-stateless/nifi-stateless-bootstrap/pom.xml    |  14 +-
 .../nifi-stateless-engine/pom.xml                  |  22 +-
 .../nifi-stateless-nar/pom.xml                     |   4 +-
 nifi-stateless/nifi-stateless-bundle/pom.xml       |   2 +-
 nifi-stateless/nifi-stateless-resources/pom.xml    |   2 +-
 nifi-stateless/pom.xml                             |   2 +-
 .../nifi-stateless-system-test-suite/pom.xml       |  28 +-
 .../nifi-system-test-extensions-nar/pom.xml        |   6 +-
 .../nifi-system-test-extensions/pom.xml            |  10 +-
 .../nifi-system-test-extensions-bundle/pom.xml     |   2 +-
 .../nifi-system-test-extensions2-nar/pom.xml       |   6 +-
 .../nifi-system-test-extensions2/pom.xml           |   6 +-
 .../nifi-system-test-extensions2-bundle/pom.xml    |   2 +-
 .../nifi-nar-provider-assembly/pom.xml             |   8 +-
 .../nifi-nar-provider-processors-nar/pom.xml       |   8 +-
 .../nifi-nar-provider-processors/pom.xml           |  10 +-
 .../nifi-nar-provider-service-api-nar/pom.xml      |   8 +-
 .../nifi-nar-provider-service-api/pom.xml          |   4 +-
 .../nifi-nar-provider-service-nar/pom.xml          |   8 +-
 .../nifi-nar-provider-service/pom.xml              |  10 +-
 .../nifi-system-test-nar-provider-bundles/pom.xml  |   2 +-
 nifi-system-tests/nifi-system-test-suite/pom.xml   |  36 +--
 nifi-system-tests/pom.xml                          |   2 +-
 nifi-toolkit/nifi-toolkit-admin/pom.xml            |  16 +-
 nifi-toolkit/nifi-toolkit-api/pom.xml              |   2 +-
 .../nifi-toolkit-assembly/docker/Dockerfile        |   2 +-
 .../nifi-toolkit-assembly/docker/Dockerfile.hub    |   2 +-
 nifi-toolkit/nifi-toolkit-assembly/pom.xml         |  16 +-
 nifi-toolkit/nifi-toolkit-cli/pom.xml              |   6 +-
 nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml   |  20 +-
 nifi-toolkit/nifi-toolkit-flowanalyzer/pom.xml     |   6 +-
 nifi-toolkit/nifi-toolkit-flowfile-repo/pom.xml    |   4 +-
 nifi-toolkit/nifi-toolkit-s2s/pom.xml              |   4 +-
 nifi-toolkit/nifi-toolkit-tls/pom.xml              |   8 +-
 .../nifi-toolkit-zookeeper-migrator/pom.xml        |   2 +-
 nifi-toolkit/pom.xml                               |   2 +-
 pom.xml                                            |   4 +-
 770 files changed, 2627 insertions(+), 2627 deletions(-)

diff --git a/c2/c2-client-bundle/c2-client-api/pom.xml b/c2/c2-client-bundle/c2-client-api/pom.xml
index 3ff21bed75..5e982ee0ba 100644
--- a/c2/c2-client-bundle/c2-client-api/pom.xml
+++ b/c2/c2-client-bundle/c2-client-api/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2-client-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-client-api</artifactId>
@@ -31,7 +31,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/c2/c2-client-bundle/c2-client-base/pom.xml b/c2/c2-client-bundle/c2-client-base/pom.xml
index d39bbb7327..727946dac3 100644
--- a/c2/c2-client-bundle/c2-client-base/pom.xml
+++ b/c2/c2-client-bundle/c2-client-base/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2-client-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-client-base</artifactId>
@@ -31,13 +31,13 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/c2/c2-client-bundle/c2-client-http/pom.xml b/c2/c2-client-bundle/c2-client-http/pom.xml
index b25a150e01..dd3e60c6d7 100644
--- a/c2/c2-client-bundle/c2-client-http/pom.xml
+++ b/c2/c2-client-bundle/c2-client-http/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2-client-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-client-http</artifactId>
@@ -31,17 +31,17 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-base</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-ssl</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml
index 8b77c96bf0..c13a147dee 100644
--- a/c2/c2-client-bundle/c2-client-service/pom.xml
+++ b/c2/c2-client-bundle/c2-client-service/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2-client-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-client-service</artifactId>
@@ -31,17 +31,17 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-base</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-http</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/c2/c2-client-bundle/pom.xml b/c2/c2-client-bundle/pom.xml
index f7e42f6121..bc22b6ebaf 100644
--- a/c2/c2-client-bundle/pom.xml
+++ b/c2/c2-client-bundle/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-client-bundle</artifactId>
diff --git a/c2/c2-protocol/c2-protocol-api/pom.xml b/c2/c2-protocol/c2-protocol-api/pom.xml
index ae0b55d7fd..6939c0aace 100644
--- a/c2/c2-protocol/c2-protocol-api/pom.xml
+++ b/c2/c2-protocol/c2-protocol-api/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2-protocol</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-protocol-api</artifactId>
@@ -31,7 +31,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-component-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/c2/c2-protocol/c2-protocol-component-api/pom.xml b/c2/c2-protocol/c2-protocol-component-api/pom.xml
index 73e05bd144..a5ebfb539c 100644
--- a/c2/c2-protocol/c2-protocol-component-api/pom.xml
+++ b/c2/c2-protocol/c2-protocol-component-api/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
     <parent>
         <artifactId>c2-protocol</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/c2/c2-protocol/pom.xml b/c2/c2-protocol/pom.xml
index 9625600356..608c522bf4 100644
--- a/c2/c2-protocol/pom.xml
+++ b/c2/c2-protocol/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>c2</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-protocol</artifactId>
diff --git a/c2/pom.xml b/c2/pom.xml
index d78488dc38..a2c458fe58 100644
--- a/c2/pom.xml
+++ b/c2/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>nifi</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2</artifactId>
@@ -37,7 +37,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml
index 74c03fd9c0..b7be9e4912 100644
--- a/minifi/minifi-assembly/pom.xml
+++ b/minifi/minifi-assembly/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-assembly</artifactId>
     <packaging>pom</packaging>
@@ -129,13 +129,13 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/minifi/minifi-bootstrap/pom.xml b/minifi/minifi-bootstrap/pom.xml
index 5ad82482df..5a1fdfea8b 100644
--- a/minifi/minifi-bootstrap/pom.xml
+++ b/minifi/minifi-bootstrap/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-bootstrap</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-api/pom.xml b/minifi/minifi-c2/minifi-c2-api/pom.xml
index 205f4bba66..8cc4fc9b44 100644
--- a/minifi/minifi-c2/minifi-c2-api/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-api/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-api</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index 3ab4d643d8..ea882aa0d9 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-assembly</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
index 85bb318716..653696bd78 100644
--- a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-cache</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-cache-filesystem</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
index 828309aeac..6671395604 100644
--- a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-cache</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-cache-s3</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-cache/pom.xml b/minifi/minifi-c2/minifi-c2-cache/pom.xml
index f3ab96f1ad..448f6bc3cf 100644
--- a/minifi/minifi-c2/minifi-c2-cache/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-cache</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
index 7755a50296..841698f9db 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi-minifi-c2:1.20.0
+apache/nifi-minifi-c2:1.21.0
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
index 61af8f9237..31dfcce05f 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org"
 
 ARG UID=1000
 ARG GID=1000
-ARG MINIFI_C2_VERSION=1.20.0
+ARG MINIFI_C2_VERSION=1.21.0
 ARG MIRROR=https://archive.apache.org/dist
 
 ENV MINIFI_C2_BASE_DIR /opt/minifi-c2
diff --git a/minifi/minifi-c2/minifi-c2-docker/pom.xml b/minifi/minifi-c2/minifi-c2-docker/pom.xml
index 9990a22b1a..fe4e1fbc98 100644
--- a/minifi/minifi-c2/minifi-c2-docker/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-docker/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-c2</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-c2-docker</artifactId>
-    <version>1.20.0-SNAPSHOT</version>
+    <version>1.21.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml b/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
index 627fccbbbf..9495a19130 100644
--- a/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-integration-tests</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-jetty/pom.xml b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
index df60b1750e..b9ad7c4c68 100644
--- a/minifi/minifi-c2/minifi-c2-jetty/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-jetty</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
index 25e564480f..39094305bf 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-cache</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
index 5c91bcaf3b..88f256cbec 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-delegating</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
index e2ab6cc520..021287dd38 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-nifi-rest</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
index c47349e5a6..98d281d7cb 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-util</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/pom.xml b/minifi/minifi-c2/minifi-c2-provider/pom.xml
index d69fe526c8..143d3e2076 100644
--- a/minifi/minifi-c2/minifi-c2-provider/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml b/minifi/minifi-c2/minifi-c2-service/pom.xml
index 5fca5a53ca..294dc28a2b 100644
--- a/minifi/minifi-c2/minifi-c2-service/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-service/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-service</artifactId>
     <packaging>war</packaging>
@@ -29,13 +29,13 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-c2-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
diff --git a/minifi/minifi-c2/pom.xml b/minifi/minifi-c2/pom.xml
index fe92b1bca0..3062a7d73d 100644
--- a/minifi/minifi-c2/pom.xml
+++ b/minifi/minifi-c2/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-commons/minifi-commons-api/pom.xml b/minifi/minifi-commons/minifi-commons-api/pom.xml
index 0e1a99f511..0960554c84 100644
--- a/minifi/minifi-commons/minifi-commons-api/pom.xml
+++ b/minifi/minifi-commons/minifi-commons-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-commons-api</artifactId>
diff --git a/minifi/minifi-commons/minifi-commons-schema/pom.xml b/minifi/minifi-commons/minifi-commons-schema/pom.xml
index 1a2ef227d4..5a8df2d64a 100644
--- a/minifi/minifi-commons/minifi-commons-schema/pom.xml
+++ b/minifi/minifi-commons/minifi-commons-schema/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-commons-schema</artifactId>
diff --git a/minifi/minifi-commons/minifi-utils/pom.xml b/minifi/minifi-commons/minifi-utils/pom.xml
index b0b66cf600..e5df2abb1f 100644
--- a/minifi/minifi-commons/minifi-utils/pom.xml
+++ b/minifi/minifi-commons/minifi-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-utils</artifactId>
diff --git a/minifi/minifi-commons/pom.xml b/minifi/minifi-commons/pom.xml
index b6ef4b6c27..9617a280e7 100644
--- a/minifi/minifi-commons/pom.xml
+++ b/minifi/minifi-commons/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-commons</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-docker/dockerhub/DockerImage.txt b/minifi/minifi-docker/dockerhub/DockerImage.txt
index 662a0b7091..1a9ccadd05 100644
--- a/minifi/minifi-docker/dockerhub/DockerImage.txt
+++ b/minifi/minifi-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi-minifi:1.20.0
+apache/nifi-minifi:1.21.0
diff --git a/minifi/minifi-docker/dockerhub/Dockerfile b/minifi/minifi-docker/dockerhub/Dockerfile
index f08c1bb419..e2ff3b4c06 100644
--- a/minifi/minifi-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org"
 
 ARG UID=1000
 ARG GID=1000
-ARG MINIFI_VERSION=1.20.0
+ARG MINIFI_VERSION=1.21.0
 ARG MIRROR=https://archive.apache.org/dist
 
 ENV MINIFI_BASE_DIR /opt/minifi
diff --git a/minifi/minifi-docker/pom.xml b/minifi/minifi-docker/pom.xml
index e8a8412302..5f7f2cf7cb 100644
--- a/minifi/minifi-docker/pom.xml
+++ b/minifi/minifi-docker/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
diff --git a/minifi/minifi-docs/pom.xml b/minifi/minifi-docs/pom.xml
index e94143d364..80a35f407e 100644
--- a/minifi/minifi-docs/pom.xml
+++ b/minifi/minifi-docs/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>minifi-docs</artifactId>
diff --git a/minifi/minifi-integration-tests/pom.xml b/minifi/minifi-integration-tests/pom.xml
index 308ca9fbaf..5b698c7d93 100644
--- a/minifi/minifi-integration-tests/pom.xml
+++ b/minifi/minifi-integration-tests/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-integration-tests</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 6132523025..4162b64c01 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-framework-bundle</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,7 +35,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -97,7 +97,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-nar-loading-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml
index 5c509fb747..c095dc58c5 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-framework</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-framework-api</artifactId>
@@ -29,18 +29,18 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-headless-server</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
index 71b68792bb..f988c53a7c 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-framework</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-framework-core</artifactId>
@@ -29,17 +29,17 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-commons-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-client-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml
index d3f8ee96ad..4828cfd765 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-framework</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-resources</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml
index 883384bf5a..9321bff922 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-framework</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-runtime</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml
index a2fb9e468d..eb79e6a981 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-framework</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-server</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml
index fe0cabe6b3..c99053bbf7 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-framework-bundle</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-framework</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
index 11bd50a68e..375b3ad745 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-framework-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-server-nar</artifactId>
     <packaging>nar</packaging>
@@ -30,18 +30,18 @@
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-headless-server</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
index 6c6c1e1039..ed0eb7ad6c 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
    <parent>
         <artifactId>minifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,47 +37,47 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>c2-client-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-headless-server</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar-loading-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-properties-loader</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-mock</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
diff --git a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
index c8e46cef1f..c54fe6e193 100644
--- a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-provenance-repository-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-provenance-repositories</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
index c43ed722c6..52e24868a0 100644
--- a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-provenance-repository-bundle</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-provenance-repository-nar</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml
index b58f6b2601..434f7ab238 100644
--- a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-provenance-repository-bundle</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
index 1995d8066c..e72e51d166 100644
--- a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,7 +34,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -49,12 +49,12 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-prioritizers</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-reporting-tasks</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml
index 90268337dc..52e6072082 100644
--- a/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,12 +33,12 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-processor</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-model</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/minifi/minifi-nar-bundles/pom.xml b/minifi/minifi-nar-bundles/pom.xml
index 1645c17a14..8613e41a14 100644
--- a/minifi/minifi-nar-bundles/pom.xml
+++ b/minifi/minifi-nar-bundles/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-nar-bundles</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
index a2f67957e6..67858910d7 100644
--- a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
+++ b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-toolkit</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-toolkit-assembly</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
index 2d053d881d..09034c1595 100644
--- a/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
+++ b/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-toolkit</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-toolkit-configuration</artifactId>
     <packaging>jar</packaging>
diff --git a/minifi/minifi-toolkit/pom.xml b/minifi/minifi-toolkit/pom.xml
index f588469510..0e98583c15 100644
--- a/minifi/minifi-toolkit/pom.xml
+++ b/minifi/minifi-toolkit/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-toolkit</artifactId>
     <packaging>pom</packaging>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 43679de57c..4c17cf1f4d 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
@@ -49,42 +49,42 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-bootstrap-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-deprecation-log</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-bootstrap</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-core</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-resources</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-provenance-repository-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
@@ -92,45 +92,45 @@ limitations under the License.
                 <artifactId>minifi-resources</artifactId>
                 <classifier>resources</classifier>
                 <type>zip</type>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-runtime</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-standard-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-server-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-update-attribute-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-docs</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -138,7 +138,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-provenance-repositories</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -212,77 +212,77 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-client</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-expression-language</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-web-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-custom-ui-utilities</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ui-extension</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-flowfile-packager</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-socket-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-data-provenance-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-provenance-repository-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-runtime</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-toolkit-tls</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-resources</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -290,7 +290,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-docs</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -298,218 +298,218 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-core</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-provenance-repository-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-services-api-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-record-serialization-services-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-dbcp-service-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-distributed-cache-services-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-proxy-configuration-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-http-context-map-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-oauth2-provider-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-lookup-services-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-registry-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-jetty-bundle</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-headless-server-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-update-attribute-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-kerberos-credentials-service-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-properties</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-ssl</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-xml-processing</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-logging-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nar-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-hadoop-utils</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-mock</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-write-ahead-log</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-prioritizers</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-administration</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-core-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-persistent-provenance-repository</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-reporting-task</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-reporting-nar</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
 
             <!-- C2 modules -->
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>c2-client-api</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>c2-client-base</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml
index ee1e944c72..365480dd53 100644
--- a/nifi-api/pom.xml
+++ b/nifi-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-api</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 9214536eec..af803aa051 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-assembly</artifactId>
     <packaging>pom</packaging>
@@ -141,53 +141,53 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-factory</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-resources</artifactId>
             <classifier>resources</classifier>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>runtime</scope>
             <type>zip</type>
         </dependency>
@@ -195,775 +195,775 @@ language governing permissions and limitations under the License. -->
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-docs</artifactId>
             <classifier>resources</classifier>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>runtime</scope>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-provenance-repository-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-key-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cipher-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-datadog-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-libraries-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-1-0-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-2-0-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-2-6-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-platform-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-http-context-map-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-html-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-poi-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kudu-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ldap-iaa-providers-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-iaa-providers-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-single-user-iaa-providers-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dbcp-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-dbcp-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 	<dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-solr-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-social-media-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hl7-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ccda-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-language-translation-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-enrich-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-geohash-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ambari-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-rethinkdb-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-prometheus-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-network-processors-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-riemann-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase_1_1_2-client-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase_2-client-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-oauth2-provider-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-scripting-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-groovyx-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-restapi-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cybersecurity-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-email-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-amqp-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-splunk-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jms-cf-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jms-processors-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-spring-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-registry-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-reporting-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mqtt-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-snmp-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-evtx-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-slack-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-smb-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-smb-client-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-smb-smbj-client-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-windows-event-log-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-services-jetty-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-processors-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-workday-processors-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-tcp-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateful-analysis-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cdc-mysql-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parquet-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hwx-schema-registry-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-redis-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-redis-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-asana-processors-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-asana-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-asana-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hazelcast-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hazelcast-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics-reporter-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics-reporting-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 	    <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-user-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jolt-record-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-sink-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault-client-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-processor-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-salesforce-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-web-client-provider-service-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hubspot-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-zendesk-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-processors-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-airtable-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flow-registry-client-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-shopify-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jslt-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 -->
@@ -1002,25 +1002,25 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-graph-client-service-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-neo4j-cypher-service-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-graph-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-other-graph-services-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1040,7 +1040,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-grpc-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1060,7 +1060,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-atlas-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1077,13 +1077,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive-services-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1103,13 +1103,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive_1_1-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive-services-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1129,13 +1129,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive3-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive-services-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1154,7 +1154,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-media-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1172,13 +1172,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-easyrules-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-rules-action-handler-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1196,19 +1196,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-sql-reporting-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-easyrules-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-rules-action-handler-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1223,14 +1223,14 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-server-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-headless-server-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1248,19 +1248,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
 	    	</dependency>
 		<dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-services-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
 		</dependency>
 		<dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-services-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1500,13 +1500,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-ranger-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-ranger-resources</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -1522,7 +1522,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-asn1-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1539,19 +1539,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-snowflake-services-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-snowflake-services-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-snowflake-processors-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1629,19 +1629,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-iceberg-processors-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-iceberg-services-api-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-iceberg-services-nar</artifactId>
-                    <version>1.20.0-SNAPSHOT</version>
+                    <version>1.21.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml
index 991d11cc83..7854a863a4 100644
--- a/nifi-bootstrap/pom.xml
+++ b/nifi-bootstrap/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bootstrap</artifactId>
     <packaging>jar</packaging>
@@ -27,44 +27,44 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-deprecation-log</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-xml-processing</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flow-encryptor</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-single-user-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <!-- Jakarta Mail 1 required for compatibility with Jakarta Activation 1 used with JAXB 2 -->
@@ -93,7 +93,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -113,12 +113,12 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties-loader</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-commons/nifi-bootstrap-utils/pom.xml b/nifi-commons/nifi-bootstrap-utils/pom.xml
index 72707944e5..85021b1e03 100644
--- a/nifi-commons/nifi-bootstrap-utils/pom.xml
+++ b/nifi-commons/nifi-bootstrap-utils/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bootstrap-utils</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-commons/nifi-build/pom.xml b/nifi-commons/nifi-build/pom.xml
index c644578213..bd2d99bd7f 100644
--- a/nifi-commons/nifi-build/pom.xml
+++ b/nifi-commons/nifi-build/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-build</artifactId>
 </project>
diff --git a/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi-commons/nifi-data-provenance-utils/pom.xml
index 7c4a68c4a0..2906792c5b 100644
--- a/nifi-commons/nifi-data-provenance-utils/pom.xml
+++ b/nifi-commons/nifi-data-provenance-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-data-provenance-utils</artifactId>
     <packaging>jar</packaging>
@@ -25,17 +25,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-deprecation-log/pom.xml b/nifi-commons/nifi-deprecation-log/pom.xml
index 2ff20a27f6..a5cdeca3a2 100644
--- a/nifi-commons/nifi-deprecation-log/pom.xml
+++ b/nifi-commons/nifi-deprecation-log/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-deprecation-log</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml
index cb51fa3932..90275c1d18 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-expression-language</artifactId>
     <packaging>jar</packaging>
@@ -91,22 +91,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parameter</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-uuid5</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
diff --git a/nifi-commons/nifi-external-resource-utils/pom.xml b/nifi-commons/nifi-external-resource-utils/pom.xml
index 3b284b314a..e2b34a9e09 100644
--- a/nifi-commons/nifi-external-resource-utils/pom.xml
+++ b/nifi-commons/nifi-external-resource-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-external-resource-utils</artifactId>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-flow-encryptor/pom.xml b/nifi-commons/nifi-flow-encryptor/pom.xml
index 787781d155..db710f7bac 100644
--- a/nifi-commons/nifi-flow-encryptor/pom.xml
+++ b/nifi-commons/nifi-flow-encryptor/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flow-encryptor</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-encryptor</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <exclusions>
                 <!-- Excluded to avoid unnecessary runtime dependencies -->
                 <exclusion>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-xml-processing</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml
index 5053286b59..c5736494ea 100644
--- a/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flowfile-packager</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-commons/nifi-hashicorp-vault-api/pom.xml b/nifi-commons/nifi-hashicorp-vault-api/pom.xml
index 480537c1fc..936e2ff4ba 100644
--- a/nifi-commons/nifi-hashicorp-vault-api/pom.xml
+++ b/nifi-commons/nifi-hashicorp-vault-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-hashicorp-vault-api</artifactId>
 </project>
diff --git a/nifi-commons/nifi-hashicorp-vault/pom.xml b/nifi-commons/nifi-hashicorp-vault/pom.xml
index 02824de04f..2e6ea3f70b 100644
--- a/nifi-commons/nifi-hashicorp-vault/pom.xml
+++ b/nifi-commons/nifi-hashicorp-vault/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-hashicorp-vault</artifactId>
     <properties>
@@ -48,13 +48,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <!-- Runtime dependency to enable TLS client configuration -->
         <dependency>
@@ -65,13 +65,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml
index dd224196d6..1d683a9b3c 100644
--- a/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-hl7-query-language</artifactId>
diff --git a/nifi-commons/nifi-jetty-configuration/pom.xml b/nifi-commons/nifi-jetty-configuration/pom.xml
index d7a3932de3..2995c7cf85 100644
--- a/nifi-commons/nifi-jetty-configuration/pom.xml
+++ b/nifi-commons/nifi-jetty-configuration/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-jetty-configuration</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml
index 42a25d8fc9..dc905c96b7 100644
--- a/nifi-commons/nifi-json-utils/pom.xml
+++ b/nifi-commons/nifi-json-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-json-utils</artifactId>
     <packaging>jar</packaging>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-commons/nifi-logging-utils/pom.xml b/nifi-commons/nifi-logging-utils/pom.xml
index 89eb40a4bb..8270b8cc91 100644
--- a/nifi-commons/nifi-logging-utils/pom.xml
+++ b/nifi-commons/nifi-logging-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-logging-utils</artifactId>
     <description>Utilities for logging</description>
diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml
index 31f6248d8e..2d1588b45e 100644
--- a/nifi-commons/nifi-metrics/pom.xml
+++ b/nifi-commons/nifi-metrics/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-commons</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
diff --git a/nifi-commons/nifi-parameter/pom.xml b/nifi-commons/nifi-parameter/pom.xml
index be3944e603..15b8d7015f 100644
--- a/nifi-commons/nifi-parameter/pom.xml
+++ b/nifi-commons/nifi-parameter/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nifi-commons</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-commons/nifi-properties/pom.xml b/nifi-commons/nifi-properties/pom.xml
index 752a888bb7..89eee93335 100644
--- a/nifi-commons/nifi-properties/pom.xml
+++ b/nifi-commons/nifi-properties/pom.xml
@@ -19,14 +19,14 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-properties</artifactId>
 </project>
diff --git a/nifi-commons/nifi-property-encryptor/pom.xml b/nifi-commons/nifi-property-encryptor/pom.xml
index de3145d434..71eb05d54e 100644
--- a/nifi-commons/nifi-property-encryptor/pom.xml
+++ b/nifi-commons/nifi-property-encryptor/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-encryptor</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/nifi-commons/nifi-property-protection-api/pom.xml b/nifi-commons/nifi-property-protection-api/pom.xml
index 78234159e3..f587cba261 100644
--- a/nifi-commons/nifi-property-protection-api/pom.xml
+++ b/nifi-commons/nifi-property-protection-api/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-api</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-property-protection-aws/pom.xml b/nifi-commons/nifi-property-protection-aws/pom.xml
index 9625ce6221..e751d2471d 100644
--- a/nifi-commons/nifi-property-protection-aws/pom.xml
+++ b/nifi-commons/nifi-property-protection-aws/pom.xml
@@ -18,19 +18,19 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-aws</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml
index 3ac8172b2f..551a76bbd4 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-azure</artifactId>
     <dependencyManagement>
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
diff --git a/nifi-commons/nifi-property-protection-cipher/pom.xml b/nifi-commons/nifi-property-protection-cipher/pom.xml
index 74e9ae3ba2..5453cbcf19 100644
--- a/nifi-commons/nifi-property-protection-cipher/pom.xml
+++ b/nifi-commons/nifi-property-protection-cipher/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-cipher</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
diff --git a/nifi-commons/nifi-property-protection-factory/pom.xml b/nifi-commons/nifi-property-protection-factory/pom.xml
index 1ad1467bd6..9fa6e8d5a7 100644
--- a/nifi-commons/nifi-property-protection-factory/pom.xml
+++ b/nifi-commons/nifi-property-protection-factory/pom.xml
@@ -18,59 +18,59 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-factory</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-aws</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-azure</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-cipher</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-gcp</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-hashicorp</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml
index f7306163cb..29f8646409 100644
--- a/nifi-commons/nifi-property-protection-gcp/pom.xml
+++ b/nifi-commons/nifi-property-protection-gcp/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-gcp</artifactId>
     <properties>
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-property-protection-hashicorp/pom.xml b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
index 1feaba4073..7e22b92c61 100644
--- a/nifi-commons/nifi-property-protection-hashicorp/pom.xml
+++ b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
@@ -18,24 +18,24 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-hashicorp</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-property-protection-loader/pom.xml b/nifi-commons/nifi-property-protection-loader/pom.xml
index a66bee75d8..756b6fd996 100644
--- a/nifi-commons/nifi-property-protection-loader/pom.xml
+++ b/nifi-commons/nifi-property-protection-loader/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-loader</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-property-protection-shared/pom.xml b/nifi-commons/nifi-property-protection-shared/pom.xml
index 538f90a65e..d2d4fc9f17 100644
--- a/nifi-commons/nifi-property-protection-shared/pom.xml
+++ b/nifi-commons/nifi-property-protection-shared/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-shared</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-property-utils/pom.xml b/nifi-commons/nifi-property-utils/pom.xml
index d0174b934a..2e0de1a652 100644
--- a/nifi-commons/nifi-property-utils/pom.xml
+++ b/nifi-commons/nifi-property-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-utils</artifactId>
 </project>
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index 604dbd063d..c6c9f38069 100644
--- a/nifi-commons/nifi-record-path/pom.xml
+++ b/nifi-commons/nifi-record-path/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-commons</artifactId>
-    <version>1.20.0-SNAPSHOT</version>
+    <version>1.21.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nifi-record-path</artifactId>
@@ -89,22 +89,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-uuid5</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
diff --git a/nifi-commons/nifi-record/pom.xml b/nifi-commons/nifi-record/pom.xml
index 21363f4fd1..889ddb02c4 100644
--- a/nifi-commons/nifi-record/pom.xml
+++ b/nifi-commons/nifi-record/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-record</artifactId>
diff --git a/nifi-commons/nifi-repository-encryption/pom.xml b/nifi-commons/nifi-repository-encryption/pom.xml
index 7ddf34e712..caa8b5fba7 100644
--- a/nifi-commons/nifi-repository-encryption/pom.xml
+++ b/nifi-commons/nifi-repository-encryption/pom.xml
@@ -18,24 +18,24 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-repository-encryption</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kms</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml
index 462d3bd4ad..bab277dc16 100644
--- a/nifi-commons/nifi-schema-utils/pom.xml
+++ b/nifi-commons/nifi-schema-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-schema-utils</artifactId>
     <dependencies>
diff --git a/nifi-commons/nifi-security-crypto-key/pom.xml b/nifi-commons/nifi-security-crypto-key/pom.xml
index c569e48fca..8419b6ec03 100644
--- a/nifi-commons/nifi-security-crypto-key/pom.xml
+++ b/nifi-commons/nifi-security-crypto-key/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-crypto-key</artifactId>
     <description>Cryptographic key derivation function components with minimal dependencies</description>
diff --git a/nifi-commons/nifi-security-kerberos-api/pom.xml b/nifi-commons/nifi-security-kerberos-api/pom.xml
index aadb4be7c7..a10abed629 100644
--- a/nifi-commons/nifi-security-kerberos-api/pom.xml
+++ b/nifi-commons/nifi-security-kerberos-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-kerberos-api</artifactId>
 </project>
diff --git a/nifi-commons/nifi-security-kerberos/pom.xml b/nifi-commons/nifi-security-kerberos/pom.xml
index f0f2e9d83b..f4374012fc 100644
--- a/nifi-commons/nifi-security-kerberos/pom.xml
+++ b/nifi-commons/nifi-security-kerberos/pom.xml
@@ -18,19 +18,19 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-kerberos</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-security-kms/pom.xml b/nifi-commons/nifi-security-kms/pom.xml
index b112755f00..67da4e0ba4 100644
--- a/nifi-commons/nifi-security-kms/pom.xml
+++ b/nifi-commons/nifi-security-kms/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-kms</artifactId>
     <dependencies>
diff --git a/nifi-commons/nifi-security-socket-ssl/pom.xml b/nifi-commons/nifi-security-socket-ssl/pom.xml
index b31ca6f741..09629cff3a 100644
--- a/nifi-commons/nifi-security-socket-ssl/pom.xml
+++ b/nifi-commons/nifi-security-socket-ssl/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-socket-ssl</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-commons/nifi-security-ssl/pom.xml b/nifi-commons/nifi-security-ssl/pom.xml
index 24219c278c..a3f578957b 100644
--- a/nifi-commons/nifi-security-ssl/pom.xml
+++ b/nifi-commons/nifi-security-ssl/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-ssl</artifactId>
     <description>Shared TLS security components without additional dependencies</description>
diff --git a/nifi-commons/nifi-security-utils-api/pom.xml b/nifi-commons/nifi-security-utils-api/pom.xml
index f958ce5c02..9bc63fcb3e 100644
--- a/nifi-commons/nifi-security-utils-api/pom.xml
+++ b/nifi-commons/nifi-security-utils-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-utils-api</artifactId>
     <description>
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index 0cbde4af8d..662af12210 100644
--- a/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi-commons/nifi-security-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-utils</artifactId>
     <description>
@@ -30,22 +30,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-deprecation-log</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.favre.lib</groupId>
diff --git a/nifi-commons/nifi-single-user-utils/pom.xml b/nifi-commons/nifi-single-user-utils/pom.xml
index 2d74cc3967..bc40d34c74 100644
--- a/nifi-commons/nifi-single-user-utils/pom.xml
+++ b/nifi-commons/nifi-single-user-utils/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-single-user-utils</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-xml-processing</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.favre.lib</groupId>
diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml
index 21107d86d0..a1d5afccf4 100644
--- a/nifi-commons/nifi-site-to-site-client/pom.xml
+++ b/nifi-commons/nifi-site-to-site-client/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-site-to-site-client</artifactId>
@@ -34,37 +34,37 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-ssl</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-xml-processing</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-client-dto</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${httpclient.group}</groupId>
diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml
index 2be1f9955f..8ce765f95f 100644
--- a/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi-commons/nifi-socket-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-socket-utils</artifactId>
     <description>Utilities for socket communication</description>
@@ -30,12 +30,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-logging-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml
index 165f1db651..2f32e581ee 100644
--- a/nifi-commons/nifi-utils/pom.xml
+++ b/nifi-commons/nifi-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-utils</artifactId>
     <packaging>jar</packaging>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <profiles>
diff --git a/nifi-commons/nifi-uuid5/pom.xml b/nifi-commons/nifi-uuid5/pom.xml
index 1570865d26..36cfd3f4a1 100644
--- a/nifi-commons/nifi-uuid5/pom.xml
+++ b/nifi-commons/nifi-uuid5/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-uuid5</artifactId>
     <dependencies>
diff --git a/nifi-commons/nifi-web-client-api/pom.xml b/nifi-commons/nifi-web-client-api/pom.xml
index f7b61d64cd..d6eccee3c0 100644
--- a/nifi-commons/nifi-web-client-api/pom.xml
+++ b/nifi-commons/nifi-web-client-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-web-client-api</artifactId>
     <description>Abstracts standard HTTP client operations without depending on a specific HTTP library</description>
diff --git a/nifi-commons/nifi-web-client/pom.xml b/nifi-commons/nifi-web-client/pom.xml
index eddc338ac3..c8407aef08 100644
--- a/nifi-commons/nifi-web-client/pom.xml
+++ b/nifi-commons/nifi-web-client/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-web-client</artifactId>
     <description>Standard implementation of nifi-web-client-api using OkHttp</description>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-web-client-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml
index adb406d5cf..03ec262dc0 100644
--- a/nifi-commons/nifi-web-utils/pom.xml
+++ b/nifi-commons/nifi-web-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-web-utils</artifactId>
     <dependencies>
diff --git a/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi-commons/nifi-write-ahead-log/pom.xml
index a4103d195c..df58b46eae 100644
--- a/nifi-commons/nifi-write-ahead-log/pom.xml
+++ b/nifi-commons/nifi-write-ahead-log/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-write-ahead-log</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-commons/nifi-xml-processing/pom.xml b/nifi-commons/nifi-xml-processing/pom.xml
index 91db4e1e99..02bdfc3d12 100644
--- a/nifi-commons/nifi-xml-processing/pom.xml
+++ b/nifi-commons/nifi-xml-processing/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-xml-processing</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-commons/pom.xml b/nifi-commons/pom.xml
index 8a212b5b16..2c4b909c96 100644
--- a/nifi-commons/pom.xml
+++ b/nifi-commons/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-commons</artifactId>
     <packaging>pom</packaging>
diff --git a/nifi-docker/dockerhub/DockerImage.txt b/nifi-docker/dockerhub/DockerImage.txt
index 0d969c20fc..07bf959f43 100644
--- a/nifi-docker/dockerhub/DockerImage.txt
+++ b/nifi-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi:1.20.0
+apache/nifi:1.21.0
diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index bbfc499981..1a79a7d635 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -25,7 +25,7 @@ LABEL site="https://nifi.apache.org"
 
 ARG UID=1000
 ARG GID=1000
-ARG NIFI_VERSION=1.20.0
+ARG NIFI_VERSION=1.21.0
 ARG BASE_URL=https://archive.apache.org/dist
 ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}}
 ARG DISTRO_PATH=${DISTRO_PATH:-${NIFI_VERSION}}
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index 956bda8740..f54f5b07f3 100644
--- a/nifi-docker/dockerhub/pom.xml
+++ b/nifi-docker/dockerhub/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-docker</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dockerhub</artifactId>
@@ -23,7 +23,7 @@
     <properties>
         <!-- files need to exist at https://archive.apache.org/dist/nifi/${docker.nifi.version}/nifi-[toolkit-]${docker.nifi.version}-bin.zip
             so this version needs to be *before* the current ${project.version} -->
-        <docker.nifi.version>1.20.0</docker.nifi.version>
+        <docker.nifi.version>1.21.0</docker.nifi.version>
     </properties>
 
     <profiles>
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index 568af081ed..8ac165809a 100644
--- a/nifi-docker/dockermaven/pom.xml
+++ b/nifi-docker/dockermaven/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-docker</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dockermaven</artifactId>
diff --git a/nifi-docker/pom.xml b/nifi-docker/pom.xml
index 6e7ac996b9..f45c24db85 100644
--- a/nifi-docker/pom.xml
+++ b/nifi-docker/pom.xml
@@ -15,7 +15,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-docker</artifactId>
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index c1c4df9d38..039c1adad1 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>nifi-docs</artifactId>
diff --git a/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml b/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
index 98d1bcad56..2301a087da 100644
--- a/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
+++ b/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-example-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-nifi-example-nar</artifactId>
diff --git a/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml b/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
index 5133825731..79529f9a93 100644
--- a/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
+++ b/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-example-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-nifi-example-processors</artifactId>
@@ -29,12 +29,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-external/nifi-example-bundle/pom.xml b/nifi-external/nifi-example-bundle/pom.xml
index 4bf4701919..386e6ac100 100644
--- a/nifi-external/nifi-example-bundle/pom.xml
+++ b/nifi-external/nifi-example-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-external</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-example-bundle</artifactId>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nifi-example-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
index 6ae66c9c84..7a0338d83a 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-kafka-connect</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,22 +27,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-connector</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
 
@@ -64,27 +64,27 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-nar-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <!-- SLF4J bridges to include -->
@@ -108,13 +108,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml
index 284ca4cbcc..433f4ec05a 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-kafka-connect</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-connector-assembly</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -42,19 +42,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-system-test-extensions-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
index bddcd10cec..49a14c15ec 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-kafka-connect</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,22 +33,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
 
@@ -70,39 +70,39 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-nar-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 
diff --git a/nifi-external/nifi-kafka-connect/pom.xml b/nifi-external/nifi-kafka-connect/pom.xml
index 6751e44266..f858107e8a 100644
--- a/nifi-external/nifi-kafka-connect/pom.xml
+++ b/nifi-external/nifi-kafka-connect/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-external</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml
index 3ea5efe3b9..2fb02d153f 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-external</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-spark-receiver</artifactId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-client</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <dependencyManagement>
diff --git a/nifi-external/pom.xml b/nifi-external/pom.xml
index 6b85e1462f..a352849f6e 100644
--- a/nifi-external/pom.xml
+++ b/nifi-external/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-external</artifactId>
     <packaging>pom</packaging>
diff --git a/nifi-framework-api/pom.xml b/nifi-framework-api/pom.xml
index bf1d492cfc..0dc8f06211 100644
--- a/nifi-framework-api/pom.xml
+++ b/nifi-framework-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-api</artifactId>
     <packaging>jar</packaging>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-h2/nifi-h2-database-migrator/pom.xml b/nifi-h2/nifi-h2-database-migrator/pom.xml
index 6a481c3e17..f798729685 100644
--- a/nifi-h2/nifi-h2-database-migrator/pom.xml
+++ b/nifi-h2/nifi-h2-database-migrator/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-h2</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-h2-database-migrator</artifactId>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-h2-database</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-h2/nifi-h2-database/pom.xml b/nifi-h2/nifi-h2-database/pom.xml
index 80a6f8f213..c5fd7b6d17 100644
--- a/nifi-h2/nifi-h2-database/pom.xml
+++ b/nifi-h2/nifi-h2-database/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-h2</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-h2-database</artifactId>
diff --git a/nifi-h2/pom.xml b/nifi-h2/pom.xml
index c8dc7accd9..b39af3fcf0 100644
--- a/nifi-h2/pom.xml
+++ b/nifi-h2/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-h2</artifactId>
diff --git a/nifi-manifest/nifi-extension-manifest-model/pom.xml b/nifi-manifest/nifi-extension-manifest-model/pom.xml
index f96e75d477..a0a6bfca76 100644
--- a/nifi-manifest/nifi-extension-manifest-model/pom.xml
+++ b/nifi-manifest/nifi-extension-manifest-model/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-manifest</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-extension-manifest-model</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-manifest/nifi-extension-manifest-parser/pom.xml b/nifi-manifest/nifi-extension-manifest-parser/pom.xml
index 5b29092d54..ea9c5ff7cf 100644
--- a/nifi-manifest/nifi-extension-manifest-parser/pom.xml
+++ b/nifi-manifest/nifi-extension-manifest-parser/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-manifest</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-extension-manifest-parser</artifactId>
     <packaging>jar</packaging>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-model</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-manifest/nifi-runtime-manifest-core/pom.xml b/nifi-manifest/nifi-runtime-manifest-core/pom.xml
index 7ce7a48e13..fbf1d05baa 100644
--- a/nifi-manifest/nifi-runtime-manifest-core/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest-core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-manifest</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-runtime-manifest-core</artifactId>
     <packaging>jar</packaging>
@@ -27,22 +27,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-component-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-model</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-parser</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-manifest/nifi-runtime-manifest-test/pom.xml b/nifi-manifest/nifi-runtime-manifest-test/pom.xml
index f08f6ae918..b4fc07851e 100644
--- a/nifi-manifest/nifi-runtime-manifest-test/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest-test/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-manifest</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-runtime-manifest-test</artifactId>
     <packaging>jar</packaging>
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime-manifest</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime-manifest-core</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-manifest/nifi-runtime-manifest/pom.xml b/nifi-manifest/nifi-runtime-manifest/pom.xml
index 87d69216d0..529f461775 100644
--- a/nifi-manifest/nifi-runtime-manifest/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-manifest</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-runtime-manifest</artifactId>
     <packaging>jar</packaging>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-assembly</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <classifier>manifests</classifier>
             <type>zip</type>
             <optional>true</optional>
@@ -127,7 +127,7 @@
                     <dependency>
                         <groupId>org.apache.nifi</groupId>
                         <artifactId>nifi-runtime-manifest-core</artifactId>
-                        <version>1.20.0-SNAPSHOT</version>
+                        <version>1.21.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/nifi-manifest/pom.xml b/nifi-manifest/pom.xml
index d7d75bba93..45a353f65a 100644
--- a/nifi-manifest/pom.xml
+++ b/nifi-manifest/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-manifest</artifactId>
     <packaging>pom</packaging>
diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index 1ed8db034c..9b9935f503 100644
--- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-maven-archetypes</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-processor-bundle-archetype</artifactId>
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
index e9fda964d7..34e3a6eb53 100644
--- a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
+++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-maven-archetypes</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-service-bundle-archetype</artifactId>
diff --git a/nifi-maven-archetypes/pom.xml b/nifi-maven-archetypes/pom.xml
index d782dc899e..87190c23cb 100644
--- a/nifi-maven-archetypes/pom.xml
+++ b/nifi-maven-archetypes/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-maven-archetypes</artifactId>
diff --git a/nifi-mock/pom.xml b/nifi-mock/pom.xml
index d4f49c9bbc..1e9033bc84 100644
--- a/nifi-mock/pom.xml
+++ b/nifi-mock/pom.xml
@@ -18,39 +18,39 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-mock</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parameter</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-core-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>asm</groupId>
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-data-provenance-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <!-- Dependency marked as compile, not test, because we have assertion
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml
index c5509e2b16..bb50ddeaec 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-nar</artifactId>
@@ -33,17 +33,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
index 138404dc9c..63d43bc4d0 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
 	    <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-processors</artifactId>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -52,34 +52,34 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
@@ -100,13 +100,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml
index 5f19eccc69..119d8f4395 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-api-nar</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml
index 5c62acbfc3..ee4350f392 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
 	    <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-api</artifactId>
@@ -45,22 +45,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml
index 2e69a6cb49..46dd5289b8 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-nar</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
            <artifactId>nifi-accumulo-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml
index 79877ad8d3..27ca694dfb 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml
@@ -19,7 +19,7 @@
     <parent>
 	    <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services</artifactId>
@@ -37,57 +37,57 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-user-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index aea703b499..5d00b8ec0d 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-accumulo-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <!-- Override Hadoop from accumulo-core -->
             <dependency>
diff --git a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml
index 8f211d3a73..08b53751ac 100644
--- a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>nifi-airtable-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-airtable-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml
index dd33d57024..c0ce07c681 100644
--- a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>nifi-airtable-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-web-client-provider-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-airtable-bundle/pom.xml b/nifi-nar-bundles/nifi-airtable-bundle/pom.xml
index 8876a9dff6..5865900263 100644
--- a/nifi-nar-bundles/nifi-airtable-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-airtable-bundle/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>nifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml
index ed91188b94..b515f07645 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-ambari-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ambari-nar</artifactId>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ambari-reporting-task</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
index 27b793f34e..0dfdc46b74 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-ambari-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ambari-reporting-task</artifactId>
@@ -41,23 +41,23 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
index b257a6df84..dcfad3e838 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ambari-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml
index abb17da8f6..db324075b3 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-amqp-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-amqp-nar</artifactId>
     <packaging>nar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
index 647b075810..943f8a2dd6 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-amqp-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-amqp-processors</artifactId>
     <packaging>jar</packaging>
@@ -40,7 +40,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -49,7 +49,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
index 5ea071eb83..ff989a2a2d 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-amqp-bundle</artifactId>
     <packaging>pom</packaging>
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-amqp-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors-nar/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors-nar/pom.xml
index 34813b93e7..327203ff18 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-asana-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-processors-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors/pom.xml
index 62d4d83fa5..b018c9a4ee 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-asana-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-processors</artifactId>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api-nar/pom.xml
index b97eb73d95..c70bcd0fe6 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-asana-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-services-api-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api/pom.xml
index dcb0f775ab..34b7cf8862 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-asana-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-services-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-nar/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-nar/pom.xml
index 762a53aa38..a4b96c4e33 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-asana-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-services-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services/pom.xml
index 507c4fa008..1f7b330061 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/nifi-asana-services/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-asana-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-services</artifactId>
diff --git a/nifi-nar-bundles/nifi-asana-bundle/pom.xml b/nifi-nar-bundles/nifi-asana-bundle/pom.xml
index 03bd423926..cafbcc76e1 100644
--- a/nifi-nar-bundles/nifi-asana-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-asana-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-asana-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml
index ceccce3d0b..e4343b3093 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-asn1-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-asn1-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
index a19f15cf29..002c2b80da 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-asn1-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.beanit</groupId>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
index 81d5564d61..85646b839f 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml
index 5b923a7d9f..9b28d0599b 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-atlas-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-atlas-nar</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
index 66fbad0324..2bfe6b8121 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-atlas-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-atlas-reporting-task</artifactId>
@@ -41,12 +41,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index f32e1104f2..54d3c11f49 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-atlas-bundle</artifactId>
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-atlas-reporting-task</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml
index e799157e85..945241128d 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-avro-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-avro-nar</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
index e61ffd2b28..95f58564d9 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
@@ -15,7 +15,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-avro-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-avro-processors</artifactId>
@@ -29,7 +29,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -50,7 +50,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
index cb29fc434e..308f5055e5 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-avro-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
index da99b90d32..15ea652bc5 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-aws-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-abstract-processors</artifactId>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
index a8689a3b74..8ae718da61 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-aws-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-nar</artifactId>
@@ -33,23 +33,23 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-parameter-providers</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-parameter-value-providers</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
index f846cc3026..d17b3d6c08 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-aws-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-parameter-providers</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -62,13 +62,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml
index d75071dc94..43c8ddc98e 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-aws-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-parameter-value-providers</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
index dddd131bb4..49d99e10a9 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-aws-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-processors</artifactId>
@@ -36,17 +36,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-abstract-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -112,13 +112,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml
index c69b60002f..10583cee78 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-aws-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-service-api-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml
index aaf46c2f69..daa18de339 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-aws-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index d86a91444a..04124e9f23 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
index 76c2cf6b59..82edbf27aa 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-azure-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nifi-azure-graph-authorizer</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.graph</groupId>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml
index 017aabe02e..0266b87180 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-azure-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-azure-nar</artifactId>
@@ -33,17 +33,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-reporting-task</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-graph-authorizer</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <exclusions>
                 <!-- Exclude Guava provided in nifi-azure-services-api-nar -->
                 <exclusion>
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-parameter-providers</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/pom.xml
index d409af5367..90db45e865 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-azure-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-azure-parameter-providers</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-nar-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 2f462a0c0e..7f0b06601a 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-azure-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-azure-processors</artifactId>
     <packaging>jar</packaging>
@@ -30,12 +30,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-service-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -114,37 +114,37 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -166,7 +166,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml
index e728144c50..9c5450b9c4 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-azure-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-azure-reporting-task</artifactId>
     <packaging>jar</packaging>
@@ -24,22 +24,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml
index 4f9b0f4e99..b19058277e 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-azure-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml
index 5cd95732f3..b33d52d6c5 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-azure-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 3b010147bb..927eb403ac 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-azure-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml
index c45bab3199..490b6b6d18 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-beats-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-beats-nar</artifactId>
@@ -29,12 +29,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-beats-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml
index 8d3c04c92a..96f71aca1c 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-beats-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-beats-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-listen</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.nifi</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
index 8e4bae21de..b0eb95ee43 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-beats-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml
index dbeeb61885..88b457ace2 100644
--- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-box-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-processors/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-processors/pom.xml
index 399c265e46..d257b309b9 100644
--- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-box-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-processors</artifactId>
@@ -29,13 +29,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-conflict-resolution</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml
index 8bd795552d..4b15f5f3fe 100644
--- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-box-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-services-api-nar</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml
index 17547e046c..ec329c64b2 100644
--- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-box-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-services-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-nar/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-nar/pom.xml
index d25a1c4496..df918b2c0e 100644
--- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-box-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-services-nar</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services/pom.xml
index ef27a6e682..90cadf875a 100644
--- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-box-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-services</artifactId>
@@ -29,18 +29,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-box-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-box-bundle/pom.xml b/nifi-nar-bundles/nifi-box-bundle/pom.xml
index 5e07100c64..fa27d16e2f 100644
--- a/nifi-nar-bundles/nifi-box-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-box-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-box-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml
index 5048e3d389..2e3bddccdf 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cassandra-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
@@ -29,29 +29,29 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <artifactId>nifi-utils</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <artifactId>nifi-record</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -67,30 +67,30 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml
index 2d21bcd7a3..49b6a2d1cb 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cassandra-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cassandra-nar</artifactId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
index 4ab38d36af..8f6d23e13c 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cassandra-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cassandra-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml
index fa447e0a9c..d363a723b7 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-cassandra-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml
index b921007764..962b43a1c3 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-cassandra-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml
index 2abe23d846..034f0be528 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-cassandra-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,18 +39,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml
index 206223d4be..5c9bc0924b 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-cassandra-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,13 +29,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -54,19 +54,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
index 705f7371bb..031af55cde 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-cassandra-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <!-- Override commons-compress -->
             <dependency>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml
index 06e6f4d65f..91ea238270 100644
--- a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-ccda-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ccda-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml
index a69f811823..484c71fae3 100644
--- a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-ccda-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ccda-processors</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-xml-processing</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
index 6ceca7fa94..035454f306 100644
--- a/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ccda-bundle</artifactId>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ccda-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml
index 2440d1f7a1..f5b7ae7d5f 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cdc</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-cdc-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml
index 884da3c207..38916181df 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cdc-mysql-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cdc-mysql-nar</artifactId>
     <packaging>nar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml
index 7005f5e605..b0c29eab8c 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cdc-mysql-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cdc-mysql-processors</artifactId>
     <packaging>jar</packaging>
@@ -27,12 +27,12 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cdc-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml
index 0fbaaa2957..a404d107c7 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cdc</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cdc-mysql-bundle</artifactId>
     <packaging>pom</packaging>
@@ -32,7 +32,7 @@
           <dependency>
               <groupId>org.apache.nifi</groupId>
               <artifactId>nifi-cdc-mysql-processors</artifactId>
-              <version>1.20.0-SNAPSHOT</version>
+              <version>1.21.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-cdc/pom.xml b/nifi-nar-bundles/nifi-cdc/pom.xml
index 07ac6fef67..74d467c4de 100644
--- a/nifi-nar-bundles/nifi-cdc/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cdc</artifactId>
     <packaging>pom</packaging>
diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml
index 7df58d8e9e..1cf1a03341 100644
--- a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cipher-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cipher-nar</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cipher-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml
index a06a318a7f..df751f4f8d 100644
--- a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cipher-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cipher-processors</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-crypto-key</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml
index f9291460c8..269afa5caf 100644
--- a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cipher-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml
index c735b3876c..8a8442de3b 100644
--- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-confluent-platform-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-confluent-platform-nar</artifactId>
     <packaging>nar</packaging>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-schema-registry-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml
index 08ad846586..b45701cd0f 100644
--- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml
+++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-confluent-platform-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-confluent-schema-registry-service</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-web-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
index 45da16160f..464e34fecc 100644
--- a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.apache.nifi</groupId>
 		<artifactId>nifi-nar-bundles</artifactId>
-		<version>1.20.0-SNAPSHOT</version>
+		<version>1.21.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nifi-confluent-platform-bundle</artifactId>
 	<packaging>pom</packaging>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml
index b78cec75b1..1ffb2049a6 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml
index ce028ad54a..1094476869 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-processors</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml
index a72c3a9f17..a0419ace62 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-services-api-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml
index f3ddaad512..ab844b1672 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-services-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
index b33e9fbc07..5c8e1ce848 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml
index 1aee91d41d..fedddc0f39 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cybersecurity-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cybersecurity-nar</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cybersecurity-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml
index bddf4a04aa..ae77ebdcd1 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cybersecurity-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cybersecurity-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>info.debatty</groupId>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
index 1719f841e3..311ed516d1 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cybersecurity-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml
index 5fd2ab872d..801744b172 100644
--- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-datadog-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-datadog-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
index 0acf955e7a..80dc6e2ea5 100644
--- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-datadog-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-datadog-reporting-task</artifactId>
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.coursera</groupId>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
index 32550a13f1..e46f279b42 100644
--- a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-datadog-bundle</artifactId>
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-datadog-reporting-task</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml
index 680aac5214..965f79a120 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-dropbox-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-processors-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
index 52f4fa6e8a..836236467b 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-dropbox-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-conflict-resolution</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml
index a841299936..057c9f259f 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <artifactId>nifi-dropbox-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-services-api-nar</artifactId>
-    <version>1.20.0-SNAPSHOT</version>
+    <version>1.21.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api/pom.xml
index 61c979d8d7..80859fd4ab 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-dropbox-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-services-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml
index 963355f313..2a25f9b0a4 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-dropbox-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-services-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services/pom.xml
index 2cd2977594..54e0500855 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-dropbox-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-services</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dropbox-services-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml
index a89606d9c3..bf20c3328f 100644
--- a/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <artifactId>nifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dropbox-bundle</artifactId>
-    <version>1.20.0-SNAPSHOT</version>
+    <version>1.21.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml
index 213adb025f..65672daa57 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-easyrules-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-easyrules-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
index 67dd3e6cd6..7bb2172ed7 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-easyrules-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-rules-engine-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jeasy</groupId>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
index feedb7da3e..020f568b40 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-nar-bundles</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-easyrules-service</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml
index a1fde82ce8..0272c4c261 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml
index 4174d0f2b2..bc051da1d8 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-api</artifactId>
@@ -29,24 +29,24 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml
index 31792e181a..05f83cf507 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-nar</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
index dde1d151d5..618a27e17e 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service</artifactId>
@@ -29,54 +29,54 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -137,13 +137,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-test-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml
index 63aefd7fb1..1958deab5f 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-nar</artifactId>
@@ -28,7 +28,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
index 9c9bf82a52..17f84c55ac 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-processors</artifactId>
@@ -34,12 +34,12 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -60,25 +60,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,7 +109,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml
index c6f88e3455..396ad6148e 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-restapi-nar</artifactId>
@@ -29,13 +29,13 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml
index 702ba00e55..e498d76c74 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
@@ -24,40 +24,40 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -70,12 +70,12 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -97,25 +97,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -127,13 +127,13 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-test-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-test-utils/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-test-utils/pom.xml
index ea4ad0747a..8dc627c7d0 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-test-utils/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-test-utils</artifactId>
@@ -24,7 +24,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
index 1c0cd7b10b..275f0c88ab 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
@@ -15,7 +15,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-bundle</artifactId>
@@ -38,12 +38,12 @@ language governing permissions and limitations under the License. -->
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-elasticsearch-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <!-- Override commons-compress -->
             <dependency>
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml
index 5e549813b9..a0f8aae7be 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-email-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-email-nar</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index 0a349e85a5..0b06984556 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-email-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-email-processors</artifactId>
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-oauth2-provider-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-email-bundle/pom.xml b/nifi-nar-bundles/nifi-email-bundle/pom.xml
index 6b4b491894..d69b887219 100644
--- a/nifi-nar-bundles/nifi-email-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-email-bundle</artifactId>
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-email-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml
index 56771d3928..db1d0d8da4 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-enrich-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-enrich-nar</artifactId>
     <packaging>nar</packaging>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
index ef6784c83f..8ffb09d291 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-enrich-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -96,13 +96,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
index 0eaa38e7b8..cb51ea621a 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-enrich-bundle</artifactId>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-enrich-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml
index e06c5275b5..5ebaf49c90 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
     <parent>
         <artifactId>nifi-evtx-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -29,7 +29,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
index ee30a79941..757d599a78 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>nifi-evtx-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-evtx-processors</artifactId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -54,13 +54,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-xml-processing</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
index 88b9022d84..35295a718f 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-evtx-bundle</artifactId>
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-evtx-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml
index 9b759fe6f4..90f9f0d9a6 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bin-manager</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-conflict-resolution/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-conflict-resolution/pom.xml
index 8531d16ef3..36a4f24d36 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-conflict-resolution/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-conflict-resolution/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-conflict-resolution</artifactId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml
index dfbbc9261a..ee76e02287 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-database-test-utils</artifactId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
index faf01f0442..a6b69431c3 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-database-utils</artifactId>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/pom.xml
index b6a409ea04..0c3f365da9 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nifi-extension-utils</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-dbcp-base</artifactId>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml
index bb50f35a59..649d947262 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-event-listen</artifactId>
     <packaging>jar</packaging>
@@ -30,17 +30,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-transport</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml
index 2d0d39e0e7..f883febf80 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-event-put</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-transport</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
index b694dd11f1..2d4cc031eb 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-event-transport</artifactId>
     <packaging>jar</packaging>
@@ -30,12 +30,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
index 71f1ba6f8b..13d586b5f4 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-hadoop-utils</artifactId>
     <packaging>jar</packaging>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml
index b0563cf54e..31df548081 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-kerberos-test-utils</artifactId>
@@ -27,17 +27,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
index ee4773563b..d18ec31698 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-listed-entity</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml
index 55b696259c..78ad3bcbff 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-prometheus-utils</artifactId>
     <packaging>jar</packaging>
@@ -41,17 +41,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <!-- The client -->
         <dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml
index 1ab8e0cfc4..edcf4561c0 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-put-pattern</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
index ebf52fe605..be2cb6078e 100755
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-avro-record-utils</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml
index 307801e0cf..5c86bcffda 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-hadoop-record-utils</artifactId>
     <packaging>jar</packaging>
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <!-- Other modules using nifi-hadoop-utils are expected to have the below dependencies available, typically through a NAR dependency -->
         <dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml
index 5b7202dab7..cac1e0e0d5 100755
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-json-record-utils</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml
index a3ae9e6966..b783d2369f 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-mock-record-utils</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <!-- Other modules using nifi-standard-record-utils are expected to have this API available, typically through a NAR dependency -->
         <dependency>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
index 7b2199bdc8..c359d7f947 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-standard-record-utils</artifactId>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <!-- Other modules using nifi-standard-record-utils are expected to have these APIs available, typically through a NAR dependency -->
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
 	    <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
index 51a6b64b2e..b0c1d9ccbf 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>nifi-record-utils</artifactId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
index 1a5f608d7e..6cd753d62d 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-extension-utils</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml
index 5abb016617..3cf7f6a517 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-service-utils</artifactId>
     <packaging>jar</packaging>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
index 389761d74f..ab1a0835a4 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-syslog-utils</artifactId>
     <packaging>jar</packaging>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/pom.xml
index 65b396eed9..a5d8cf1cb5 100644
--- a/nifi-nar-bundles/nifi-extension-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>nifi-extension-utils</artifactId>
diff --git a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml
index 1ace639c33..2220570d14 100644
--- a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-flow-registry-client-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-flow-registry-client-nar</artifactId>
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flow-registry-client-services</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/pom.xml b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/pom.xml
index 7a446df6c0..b4ad238985 100644
--- a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/pom.xml
+++ b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-flow-registry-client-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flow-registry-client-services</artifactId>
     <packaging>jar</packaging>
@@ -25,22 +25,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-client</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml b/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml
index d876575dbb..b0e0ab6dd0 100644
--- a/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-flow-registry-client-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
index a26e96df13..b2d78eeece 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-flume-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flume-nar</artifactId>
     <packaging>nar</packaging>
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-libraries-nar</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
index 7e77f73327..d45ce7ff56 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-flume-bundle</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flume-processors</artifactId>
     <packaging>jar</packaging>
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flowfile-packager</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flume</groupId>
@@ -188,7 +188,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.20.0-SNAPSHOT</version>
+            <version>1.21.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
index bc7039da46..c9ea57923a 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.20.0-SNAPSHOT</version>
+        <version>1.21.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flume-bundle</artifactId>
     <packaging>pom</packaging>
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-flume-processors</artifactId>
-                <version>1.20.0-SNAPSHOT</version>
+                <version>1.21.0-SNAPSHOT</version>
             </dependency>
             <!-- Override Netty 3 -->
             <dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-external-resource-utils/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-external-resource-utils/pom.xml
index bcacb7cd48..04b1e639a7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-external-resource-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-external-resource-utils/pom.xml
@@ -18,7 +18,7 @@
... 14845 lines suppressed ...