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 2022/03/15 20:10:06 UTC

[nifi] branch NIFI-9780-RC2 created (now 9a9d636)

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

joewitt pushed a change to branch NIFI-9780-RC2
in repository https://gitbox.apache.org/repos/asf/nifi.git.


      at 9a9d636  NIFI-9780-RC2 prepare for next development iteration

This branch includes the following new commits:

     new a680b3f  NIFI-9780-RC2 prepare release nifi-1.16.0-RC2
     new 9a9d636  NIFI-9780-RC2 prepare for next development iteration

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[nifi] 02/02: NIFI-9780-RC2 prepare for next development iteration

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch NIFI-9780-RC2
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 9a9d636c57340de8f25b5f7f20907915a43659ef
Author: Joe Witt <jo...@apache.org>
AuthorDate: Tue Mar 15 10:21:55 2022 -0700

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

diff --git a/c2/c2-protocol/c2-protocol-api/pom.xml b/c2/c2-protocol/c2-protocol-api/pom.xml
index ce18808..5fb3fb7 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-protocol-api</artifactId>
@@ -31,12 +31,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-component-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/c2/c2-protocol/c2-protocol-component-api/pom.xml b/c2/c2-protocol/c2-protocol-component-api/pom.xml
index c24e21c..057a637 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,9 +37,4 @@ limitations under the License.
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/c2/c2-protocol/pom.xml b/c2/c2-protocol/pom.xml
index d9c6baf..e7c6150 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-protocol</artifactId>
@@ -31,8 +31,4 @@ limitations under the License.
         <module>c2-protocol-component-api</module>
         <module>c2-protocol-api</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/c2/pom.xml b/c2/pom.xml
index 29dad8e..37feecd 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2</artifactId>
@@ -36,7 +36,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml
index 65748a0..4e0f296 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-assembly</artifactId>
     <packaging>pom</packaging>
@@ -125,13 +125,13 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -388,9 +388,4 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-bootstrap/pom.xml b/minifi/minifi-bootstrap/pom.xml
index fff0bc8..cf2d83a 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-bootstrap</artifactId>
     <packaging>jar</packaging>
@@ -108,9 +108,4 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/minifi/minifi-c2/minifi-c2-api/pom.xml b/minifi/minifi-c2/minifi-c2-api/pom.xml
index 6e17167..33f7e09 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-api</artifactId>
     <packaging>jar</packaging>
@@ -43,8 +43,4 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index 28ab1b2..ba2553e 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-assembly</artifactId>
     <packaging>pom</packaging>
@@ -184,8 +184,4 @@ limitations under the License.
             <type>war</type>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 2e100da..6a4226d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-cache-filesystem</artifactId>
     <packaging>jar</packaging>
@@ -38,8 +38,4 @@ limitations under the License.
             <scope>test</scope>
        </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 5330022..b9644ac 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-cache-s3</artifactId>
     <packaging>jar</packaging>
@@ -56,8 +56,4 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-cache/pom.xml b/minifi/minifi-c2/minifi-c2-cache/pom.xml
index ffea47b..1417894 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-cache</artifactId>
     <packaging>pom</packaging>
@@ -29,8 +29,4 @@ limitations under the License.
         <module>minifi-c2-cache-filesystem</module>
 	<module>minifi-c2-cache-s3</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-docker/pom.xml b/minifi/minifi-c2/minifi-c2-docker/pom.xml
index b0d3733..4eb0adc 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-c2-docker</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -75,9 +75,5 @@ limitations under the License.
                 </plugins>
             </build>
         </profile>
-    </profiles>      
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
+    </profiles>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml b/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
index 90bcd1e..6b11b73 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-integration-tests</artifactId>
     <packaging>jar</packaging>
@@ -127,8 +127,4 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-jetty/pom.xml b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
index 3a05617..d5cbf8f 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-jetty</artifactId>
     <packaging>jar</packaging>
@@ -56,8 +56,4 @@ limitations under the License.
             <artifactId>jetty-servlets</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 f6ecc77..eca82d5 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-cache</artifactId>
     <packaging>jar</packaging>
@@ -37,8 +37,4 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 0579f58..0f8f576 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-delegating</artifactId>
     <packaging>jar</packaging>
@@ -50,8 +50,4 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 441a42b..b86a6fe 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-nifi-rest</artifactId>
     <packaging>jar</packaging>
@@ -79,8 +79,4 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 fa1c1f8..b529d66 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider-util</artifactId>
     <packaging>jar</packaging>
@@ -41,8 +41,4 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-provider/pom.xml b/minifi/minifi-c2/minifi-c2-provider/pom.xml
index eef415f..2c9cef1 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-provider</artifactId>
     <packaging>pom</packaging>
@@ -31,8 +31,4 @@ limitations under the License.
         <module>minifi-c2-provider-delegating</module>
         <module>minifi-c2-provider-nifi-rest</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml b/minifi/minifi-c2/minifi-c2-service/pom.xml
index bcf7ecc..6fcd217 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2-service</artifactId>
     <packaging>war</packaging>
@@ -95,8 +95,4 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-c2/pom.xml b/minifi/minifi-c2/pom.xml
index 5994d89..416d0ce 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2</artifactId>
     <packaging>pom</packaging>
@@ -47,9 +47,4 @@ limitations under the License.
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-commons/minifi-commons-schema/pom.xml b/minifi/minifi-commons/minifi-commons-schema/pom.xml
index 28a03e5..6f784ba 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-commons-schema</artifactId>
@@ -34,8 +34,4 @@
             <artifactId>nifi-api</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-commons/minifi-utils/pom.xml b/minifi/minifi-commons/minifi-utils/pom.xml
index b49fe00..e977ca3 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-utils</artifactId>
@@ -29,9 +29,4 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-commons/pom.xml b/minifi/minifi-commons/pom.xml
index e079725..cf8af17 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-commons</artifactId>
     <packaging>pom</packaging>
@@ -29,8 +29,4 @@ limitations under the License.
         <module>minifi-commons-schema</module>
         <module>minifi-utils</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-docker/pom.xml b/minifi/minifi-docker/pom.xml
index c7d3f16..523d44c 100644
--- a/minifi/minifi-docker/pom.xml
+++ b/minifi/minifi-docker/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-docker</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -75,9 +75,5 @@ limitations under the License.
                 </plugins>
             </build>
         </profile>
-    </profiles>      
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
+    </profiles>
 </project>
diff --git a/minifi/minifi-docs/pom.xml b/minifi/minifi-docs/pom.xml
index 141fb9d..a48d08d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>minifi-docs</artifactId>
@@ -68,8 +68,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-integration-tests/pom.xml b/minifi/minifi-integration-tests/pom.xml
index b45d040..f658e66 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-integration-tests</artifactId>
     <packaging>jar</packaging>
@@ -141,8 +141,4 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 7c1eb5f..3e2c9b4 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -111,9 +111,4 @@ limitations under the License.
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 b15c1e3..e09dd3a 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-framework-api</artifactId>
@@ -29,23 +29,19 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-headless-server</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 96e8cd2..12b8135 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-framework-core</artifactId>
@@ -29,7 +29,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -110,8 +110,4 @@ limitations under the License.
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 9a13226..d677bcd 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-resources</artifactId>
     <packaging>pom</packaging>
@@ -49,8 +49,4 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 66b47f1..dc6e330 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-runtime</artifactId>
@@ -63,9 +63,4 @@ limitations under the License.
             <artifactId>jul-to-slf4j</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 8061e7b..d8ded2a 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-server</artifactId>
     <packaging>jar</packaging>
@@ -64,10 +64,6 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
 
 
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 cc1f4b2..a859c7a 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-framework</artifactId>
     <packaging>pom</packaging>
@@ -37,8 +37,4 @@ limitations under the License.
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 d76dce1..23dd165 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-headless-server</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <!-- mark these nifi artifacts as provided since it is included in the lib -->
         <dependency>
@@ -80,8 +80,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
index a3a768f..3674f5b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,48 +37,44 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-headless-server</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar-loading-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-properties-loader</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-mock</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 3ff1ca8..fe86c21 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-provenance-repositories</artifactId>
@@ -32,8 +32,4 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 e33dc1e..d481b46 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-provenance-repository-nar</artifactId>
@@ -37,8 +37,4 @@ limitations under the License.
             <type>nar</type>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 73e9b76..b469cf4 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-provenance-repository-bundle</artifactId>
@@ -31,9 +31,4 @@ limitations under the License.
         <module>minifi-provenance-repository-nar</module>
         <module>minifi-provenance-repositories</module>
     </modules>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
index 34146b4..2e20dde 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -49,16 +49,12 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-prioritizers</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-reporting-tasks</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 5688f0c..013e428 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,16 +33,12 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-processor</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-model</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/minifi/minifi-nar-bundles/pom.xml b/minifi/minifi-nar-bundles/pom.xml
index c74c804..fad89f6 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-nar-bundles</artifactId>
@@ -32,8 +32,4 @@ limitations under the License.
         <module>minifi-update-attribute-nar</module>
         <module>minifi-standard-nar</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
index be0a421..dd8e3b3 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-toolkit-assembly</artifactId>
     <packaging>pom</packaging>
@@ -63,8 +63,4 @@ limitations under the License.
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
index b1c52b3..09a1b76 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-toolkit-configuration</artifactId>
     <packaging>jar</packaging>
@@ -50,8 +50,4 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/minifi-toolkit/pom.xml b/minifi/minifi-toolkit/pom.xml
index cdaef2e..7c5c9f0 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-toolkit</artifactId>
     <packaging>pom</packaging>
@@ -29,8 +29,4 @@ limitations under the License.
         <module>minifi-toolkit-configuration</module>
         <module>minifi-toolkit-assembly</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 90f6de0..576fedc 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>Apache NiFi - MiNiFi is a child project effort to aid in the collection and transmission of data close to where it is created.</description>
 
@@ -65,37 +65,37 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-bootstrap-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-bootstrap</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-core</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-resources</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-provenance-repository-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
@@ -103,45 +103,45 @@ limitations under the License.
                 <artifactId>minifi-resources</artifactId>
                 <classifier>resources</classifier>
                 <type>zip</type>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-runtime</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-standard-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-server-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-update-attribute-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-docs</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -149,7 +149,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-provenance-repositories</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -228,77 +228,77 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-client</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-expression-language</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-web-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-custom-ui-utilities</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ui-extension</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-flowfile-packager</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-socket-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-data-provenance-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-provenance-repository-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-runtime</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-toolkit-tls</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-resources</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -306,7 +306,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-docs</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -314,148 +314,148 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-core</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-provenance-repository-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-services-api-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-jetty-bundle</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-headless-server-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-update-attribute-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-kerberos-credentials-service-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-properties</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-logging-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nar-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-hadoop-utils</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-mock</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-write-ahead-log</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-prioritizers</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-administration</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-core-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-persistent-provenance-repository</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-reporting-task</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-reporting-nar</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Test Dependencies -->
diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml
index 5b908ea..080f476 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-api</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 1f6c649..a49e492 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-assembly</artifactId>
     <packaging>pom</packaging>
@@ -140,38 +140,38 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-resources</artifactId>
             <classifier>resources</classifier>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>runtime</scope>
             <type>zip</type>
         </dependency>
@@ -179,655 +179,655 @@ language governing permissions and limitations under the License. -->
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-docs</artifactId>
             <classifier>resources</classifier>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>runtime</scope>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-provenance-repository-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-services-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-datadog-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-libraries-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-1-0-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-2-0-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-2-6-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-platform-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-http-context-map-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-html-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-services-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-poi-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kudu-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ldap-iaa-providers-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-iaa-providers-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-single-user-iaa-providers-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dbcp-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-dbcp-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 	<dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-services-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-solr-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-social-media-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hl7-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ccda-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-language-translation-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-enrich-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-geohash-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ambari-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-rethinkdb-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-prometheus-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-influxdb-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-network-processors-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-riemann-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase_2-client-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-oauth2-provider-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-scripting-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-groovyx-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-restapi-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cybersecurity-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-email-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-amqp-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-splunk-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jms-cf-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jms-processors-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-spring-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-registry-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hive-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hive-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-reporting-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mqtt-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-snmp-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-evtx-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-slack-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-smb-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-windows-event-log-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-services-jetty-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-processors-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-tcp-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateful-analysis-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cdc-mysql-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parquet-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hwx-schema-registry-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-redis-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-redis-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hazelcast-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hazelcast-services-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics-reporter-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics-reporting-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 	    <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-user-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jolt-record-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-sink-service-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-processor-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 -->
@@ -863,25 +863,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.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-neo4j-cypher-service-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-graph-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-other-graph-services-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -898,7 +898,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-grpc-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -915,7 +915,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-atlas-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -932,7 +932,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive_1_1-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -949,7 +949,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive3-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -965,7 +965,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-media-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -980,13 +980,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-easyrules-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-rules-action-handler-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1001,19 +1001,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-sql-reporting-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-easyrules-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-rules-action-handler-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1028,14 +1028,14 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-server-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-headless-server-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1050,19 +1050,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
 	    	</dependency>
 		<dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-services-api-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
 		</dependency>
 		<dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-services-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1261,13 +1261,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-ranger-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-ranger-resources</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -1280,7 +1280,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-asn1-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1294,7 +1294,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-snowflake-services-nar</artifactId>
-                    <version>1.16.0</version>
+                    <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml
index 9871216..6d592fe 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bootstrap</artifactId>
     <packaging>jar</packaging>
@@ -27,34 +27,34 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flow-encryptor</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-single-user-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -86,12 +86,12 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties-loader</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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 25a0aa2..4ff93e6 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bootstrap-utils</artifactId>
     <packaging>jar</packaging>
@@ -32,8 +32,4 @@ language governing permissions and limitations under the License. -->
             <version>5.10.0</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi-commons/nifi-data-provenance-utils/pom.xml
index 62575e1..4f3dd73 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-data-provenance-utils</artifactId>
     <packaging>jar</packaging>
@@ -25,21 +25,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml
index afb5955..7279906 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-expression-language</artifactId>
     <packaging>jar</packaging>
@@ -61,22 +61,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parameter</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-uuid5</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -108,8 +108,4 @@
             <version>1.14</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-flow-encryptor/pom.xml b/nifi-commons/nifi-flow-encryptor/pom.xml
index 68a4097..527a2b5 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flow-encryptor</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-encryptor</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <exclusions>
                 <!-- Excluded to avoid unnecessary runtime dependencies -->
                 <exclusion>
@@ -35,8 +35,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml
index e746a03..639a77d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flowfile-packager</artifactId>
     <packaging>jar</packaging>
@@ -37,8 +37,4 @@
             <version>1.8</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml
index e47c03d..30981ba 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-hl7-query-language</artifactId>
@@ -109,8 +109,4 @@
             <version>2.3</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml
index 80f007a..40905b8 100644
--- a/nifi-commons/nifi-json-utils/pom.xml
+++ b/nifi-commons/nifi-json-utils/pom.xml
@@ -18,16 +18,16 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-json-utils</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -42,8 +42,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-logging-utils/pom.xml b/nifi-commons/nifi-logging-utils/pom.xml
index a996526..28c9ad5 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-logging-utils</artifactId>
     <description>Utilities for logging</description>
@@ -28,8 +28,4 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml
index f347c61..1a41dc2 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
@@ -76,8 +76,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-commons/nifi-parameter/pom.xml b/nifi-commons/nifi-parameter/pom.xml
index 204f426..7708bc0 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,12 +28,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-commons/nifi-properties/pom.xml b/nifi-commons/nifi-properties/pom.xml
index cc02bb4..1108a9d 100644
--- a/nifi-commons/nifi-properties/pom.xml
+++ b/nifi-commons/nifi-properties/pom.xml
@@ -19,18 +19,14 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-properties</artifactId>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-encryptor/pom.xml b/nifi-commons/nifi-property-encryptor/pom.xml
index 6f401ca..172b9e8 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-encryptor</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -41,8 +41,4 @@
             <version>1.14</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-api/pom.xml b/nifi-commons/nifi-property-protection-api/pom.xml
index c0cd105..9f6f958 100644
--- a/nifi-commons/nifi-property-protection-api/pom.xml
+++ b/nifi-commons/nifi-property-protection-api/pom.xml
@@ -18,18 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-api</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-aws/pom.xml b/nifi-commons/nifi-property-protection-aws/pom.xml
index b67faa2..8e2c014 100644
--- a/nifi-commons/nifi-property-protection-aws/pom.xml
+++ b/nifi-commons/nifi-property-protection-aws/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-aws</artifactId>
     <properties>
@@ -28,12 +28,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -80,8 +80,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml
index 5e599bd..2e71d0f 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -18,19 +18,19 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-protection-azure</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
@@ -109,8 +109,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-cipher/pom.xml b/nifi-commons/nifi-property-protection-cipher/pom.xml
index d180f2c..682022b 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -33,8 +33,4 @@
             <version>1.15</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-factory/pom.xml b/nifi-commons/nifi-property-protection-factory/pom.xml
index a4abfae..5cc2c50 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-aws</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-azure</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-cipher</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-gcp</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-hashicorp</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -79,8 +79,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml
index eeaf1b2..ae58bdf 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -61,8 +61,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-hashicorp/pom.xml b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
index a012b4a..136745d 100644
--- a/nifi-commons/nifi-property-protection-hashicorp/pom.xml
+++ b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
@@ -18,19 +18,19 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-vault-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -41,8 +41,4 @@
             <artifactId>spring-core</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-shared/pom.xml b/nifi-commons/nifi-property-protection-shared/pom.xml
index a1a5c2a..c1d7789 100644
--- a/nifi-commons/nifi-property-protection-shared/pom.xml
+++ b/nifi-commons/nifi-property-protection-shared/pom.xml
@@ -18,18 +18,14 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-utils/pom.xml b/nifi-commons/nifi-property-utils/pom.xml
index 6193222..7ac60df 100644
--- a/nifi-commons/nifi-property-utils/pom.xml
+++ b/nifi-commons/nifi-property-utils/pom.xml
@@ -18,11 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-property-utils</artifactId>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index d0c6b15..63e860c 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.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>nifi-record-path</artifactId>
@@ -59,22 +59,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-uuid5</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
@@ -97,8 +97,4 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-record/pom.xml b/nifi-commons/nifi-record/pom.xml
index 623ec99..db1ab24 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-record</artifactId>
@@ -27,8 +27,4 @@
         several interfaces for interacting with Records. This module should not depend
         on any external libraries.
     </description>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-repository-encryption/pom.xml b/nifi-commons/nifi-repository-encryption/pom.xml
index 159e50b..ef77f34 100644
--- a/nifi-commons/nifi-repository-encryption/pom.xml
+++ b/nifi-commons/nifi-repository-encryption/pom.xml
@@ -18,32 +18,28 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-repository-encryption</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kms</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-rocksdb-utils/pom.xml b/nifi-commons/nifi-rocksdb-utils/pom.xml
index bb3e229..4079004 100644
--- a/nifi-commons/nifi-rocksdb-utils/pom.xml
+++ b/nifi-commons/nifi-rocksdb-utils/pom.xml
@@ -18,21 +18,21 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-rocksdb-utils</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.rocksdb</groupId>
@@ -45,8 +45,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml
index 56b0090..97bac11 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-schema-utils</artifactId>
     <dependencies>
@@ -27,9 +27,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-security-kerberos-api/pom.xml b/nifi-commons/nifi-security-kerberos-api/pom.xml
index 11dc8da..789412e 100644
--- a/nifi-commons/nifi-security-kerberos-api/pom.xml
+++ b/nifi-commons/nifi-security-kerberos-api/pom.xml
@@ -18,11 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-kerberos-api</artifactId>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-kerberos/pom.xml b/nifi-commons/nifi-security-kerberos/pom.xml
index 9e9f58a..96b985a 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-kerberos</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -53,8 +53,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-kms/pom.xml b/nifi-commons/nifi-security-kms/pom.xml
index 95dd0ce..570f407 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-kms</artifactId>
     <dependencies>
@@ -28,8 +28,4 @@
             <version>1.15</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-socket-ssl/pom.xml b/nifi-commons/nifi-security-socket-ssl/pom.xml
index 78633ef..194418b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-socket-ssl</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -43,8 +43,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-utils-api/pom.xml b/nifi-commons/nifi-security-utils-api/pom.xml
index 849fd56..273ba09 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-utils-api</artifactId>
     <description>
@@ -28,9 +28,5 @@
     <!--
     This module cannot have any external dependencies as it is referred to by many *-api modules
       -->
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index 174f59c..d1bcd31 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kms</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.favre.lib</groupId>
@@ -131,10 +131,5 @@
             </dependencies>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-single-user-utils/pom.xml b/nifi-commons/nifi-single-user-utils/pom.xml
index 48bd774..4584673 100644
--- a/nifi-commons/nifi-single-user-utils/pom.xml
+++ b/nifi-commons/nifi-single-user-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-single-user-utils</artifactId>
     <dependencies>
@@ -34,8 +34,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml
index 37bdb41..0c5993d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-site-to-site-client</artifactId>
@@ -34,22 +34,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-client-dto</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${httpclient.group}</groupId>
@@ -144,8 +144,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml
index 4e604e0..01d09ff 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-logging-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
@@ -54,11 +54,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml
index 5487e03..e60eef5 100644
--- a/nifi-commons/nifi-utils/pom.xml
+++ b/nifi-commons/nifi-utils/pom.xml
@@ -18,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-utils</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>
         This nifi-utils module should be a general purpose place to store widely
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <profiles>
@@ -61,8 +61,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-uuid5/pom.xml b/nifi-commons/nifi-uuid5/pom.xml
index 4e05792..f59ad86 100644
--- a/nifi-commons/nifi-uuid5/pom.xml
+++ b/nifi-commons/nifi-uuid5/pom.xml
@@ -31,11 +31,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-uuid5</artifactId>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-vault-utils/pom.xml b/nifi-commons/nifi-vault-utils/pom.xml
index 97b4306..54f46ae 100644
--- a/nifi-commons/nifi-vault-utils/pom.xml
+++ b/nifi-commons/nifi-vault-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-vault-utils</artifactId>
     <properties>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <!-- Runtime dependency to enable TLS client configuration -->
         <dependency>
@@ -59,19 +59,15 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml
index 4bb02f6..4c50a6b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-web-utils</artifactId>
     <dependencies>
@@ -79,8 +79,4 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi-commons/nifi-write-ahead-log/pom.xml
index 51e3c15b..b03933b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-write-ahead-log</artifactId>
     <packaging>jar</packaging>
@@ -30,11 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-commons/pom.xml b/nifi-commons/pom.xml
index c81b2ea..3b8d009 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-commons</artifactId>
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index ae1bbdf..ec6cb5c 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dockerhub</artifactId>
@@ -135,9 +135,4 @@
             </build>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index c76d120..31ca0c0 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dockermaven</artifactId>
@@ -189,9 +189,4 @@
             </build>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-docker/pom.xml b/nifi-docker/pom.xml
index c1a4762..3b7e206 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-docker</artifactId>
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index f3246a6..b565042 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.16.0</version>
+        <version>1.17.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 f3f1630..8d6a3e4 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-nifi-example-nar</artifactId>
@@ -35,9 +35,4 @@
             <artifactId>nifi-nifi-example-processors</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 ff5e23f..87909f5 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -56,8 +56,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-external/nifi-example-bundle/pom.xml b/nifi-external/nifi-example-bundle/pom.xml
index af40338..47408b7 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-example-bundle</artifactId>
@@ -35,12 +35,8 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nifi-example-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 27f451d..d321fc1 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
 
@@ -64,27 +64,27 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-nar-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 
@@ -173,9 +173,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 f761b23..11afe4b 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 
@@ -104,9 +104,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 5081383..2fa8a95 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
 
@@ -70,39 +70,39 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-nar-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
 
@@ -124,9 +124,4 @@
             <version>1.3.2</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-external/nifi-kafka-connect/pom.xml b/nifi-external/nifi-kafka-connect/pom.xml
index 19ff360..b012cc8 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,9 +29,4 @@
         <module>nifi-kafka-connector-assembly</module>
         <module>nifi-kafka-connector-tests</module>
     </modules>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml
index cf342d5..ed31703 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-spark-receiver</artifactId>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-client</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -92,8 +92,4 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-external/pom.xml b/nifi-external/pom.xml
index 3481dbf..47bc601 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-external</artifactId>
diff --git a/nifi-framework-api/pom.xml b/nifi-framework-api/pom.xml
index 515c2d5..664d1f5 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.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 a5396a9..409b267 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-h2-database-migrator</artifactId>
 
@@ -31,11 +31,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-h2-database</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-h2/nifi-h2-database/pom.xml b/nifi-h2/nifi-h2-database/pom.xml
index 4f29572..9c61af2 100644
--- a/nifi-h2/nifi-h2-database/pom.xml
+++ b/nifi-h2/nifi-h2-database/pom.xml
@@ -14,11 +14,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-h2</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-h2-database</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -67,8 +67,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-h2/pom.xml b/nifi-h2/pom.xml
index 8592b9b..e4b509d 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.16.0</version>
+        <version>1.17.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 d5ab2e6..742ba4a 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-extension-manifest-model</artifactId>
     <packaging>jar</packaging>
@@ -51,9 +51,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-manifest/nifi-extension-manifest-parser/pom.xml b/nifi-manifest/nifi-extension-manifest-parser/pom.xml
index 43c435d..d3c6156 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -47,9 +47,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-manifest/nifi-runtime-manifest-core/pom.xml b/nifi-manifest/nifi-runtime-manifest-core/pom.xml
index 0b548a2..76bd2fc 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-model</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-parser</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -50,8 +50,4 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-manifest/nifi-runtime-manifest-test/pom.xml b/nifi-manifest/nifi-runtime-manifest-test/pom.xml
index fd36189..b3e55dc 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime-manifest-core</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -59,9 +59,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-manifest/nifi-runtime-manifest/pom.xml b/nifi-manifest/nifi-runtime-manifest/pom.xml
index 3eaa366..9f83510 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <classifier>manifests</classifier>
             <type>zip</type>
             <optional>true</optional>
@@ -128,7 +128,7 @@
                     <dependency>
                         <groupId>org.apache.nifi</groupId>
                         <artifactId>nifi-runtime-manifest-core</artifactId>
-                        <version>1.16.0</version>
+                        <version>1.17.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -151,9 +151,4 @@
             </properties>
         </profile>
     </profiles>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-manifest/pom.xml b/nifi-manifest/pom.xml
index 48c8daf..363f0b2 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.16.0</version>
+        <version>1.17.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 457aae5..a8aeb4d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-processor-bundle-archetype</artifactId>
@@ -68,9 +68,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
index ac8fc7e..5c47047 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-service-bundle-archetype</artifactId>
@@ -64,9 +64,4 @@
         </pluginManagement>
         
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-maven-archetypes/pom.xml b/nifi-maven-archetypes/pom.xml
index 5ce20cf..848767f 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.16.0</version>
+        <version>1.17.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 5dda257..1b1f051 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-mock</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parameter</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-core-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.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 2a25f7f..770c1aa 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,23 +34,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 2eb6aec..05929cf 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -52,34 +52,34 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
@@ -100,18 +100,14 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 7ca55db..dd80760 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-api-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,23 +34,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 649ee59..bf6522c 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-api</artifactId>
@@ -45,27 +45,23 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 5b9ec5a..eeff781 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,24 +34,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
            <artifactId>nifi-accumulo-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 8c64924..69bcf2d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-accumulo-services</artifactId>
@@ -37,62 +37,58 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-user-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index 40b54bd..09b35d1 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -23,7 +23,7 @@
     </properties>
 
     <artifactId>nifi-accumulo-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-accumulo-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <!-- Override commons-io:2.6 from accumulo-core -->
             <dependency>
@@ -86,8 +86,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 af4a498..1a06817 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ambari-nar</artifactId>
@@ -30,11 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ambari-reporting-task</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 ab00d2b..80e95dc 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ambari-reporting-task</artifactId>
@@ -41,28 +41,24 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
index 168b220..3d4301b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ambari-bundle</artifactId>
@@ -38,8 +38,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 3db40b1..3fd9932 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,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-amqp-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-amqp-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -39,8 +39,4 @@
             <artifactId>nifi-amqp-processors</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 65241be..0beb5a0 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -77,8 +77,4 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
index f03fe00..aeeac2c 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
@@ -18,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-amqp-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>A bundle of processors that publish to and consume messages from AMQP.</description>
     <modules>
@@ -33,12 +33,8 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-amqp-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 1338db7..0c82c6c 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,19 +32,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-asn1-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 3328702..8a2de12 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.beanit</groupId>
@@ -156,8 +156,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
index b04e130..d591632 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,8 +27,4 @@
         <module>nifi-asn1-services</module>
         <module>nifi-asn1-nar</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 b4e2095..2eef6e3 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-atlas-nar</artifactId>
@@ -37,13 +37,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 4080aaa..c702627 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -138,8 +138,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index 7aab846..6c450b3 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.16.0</version>
+        <version>1.17.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.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -88,9 +88,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 999060f..17a781e 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-avro-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-avro-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,12 +34,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 6165b46..b6bc825 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -53,7 +53,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -72,8 +72,4 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
index d5a88ca..2086594 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-avro-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -42,8 +42,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 2eb9cb6..85d870b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-abstract-processors</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -129,8 +129,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 ba78294..b2243d9 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-nar</artifactId>
@@ -33,27 +33,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-parameter-value-providers</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 6e70505..8e7c9cc 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -53,12 +53,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 4a08695..6dab1e8 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-abstract-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -108,13 +108,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -137,8 +137,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 3738857..a870789 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-service-api-nar</artifactId>
@@ -33,18 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 e8ee725..8bd7436 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,9 +50,4 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 6b3672f..01d9ca7 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-bundle</artifactId>
@@ -71,9 +71,4 @@
         <module>nifi-aws-abstract-processors</module>
         <module>nifi-aws-parameter-value-providers</module>
     </modules>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 9ec9685..86efc45 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.graph</groupId>
@@ -51,8 +51,4 @@
             <version>${msal4j.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 1d47a5d..2ec9d20 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-reporting-task</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-graph-authorizer</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <exclusions>
                 <!-- Exclude Guava provided in nifi-azure-services-api-nar -->
                 <exclusion>
@@ -55,13 +55,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 38fefb3..71eeb33 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-azure-processors</artifactId>
     <packaging>jar</packaging>
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-service-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -178,38 +178,38 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -242,8 +242,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 be654f7..bee33d8 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-azure-reporting-task</artifactId>
     <packaging>jar</packaging>
@@ -25,17 +25,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -63,18 +63,14 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     
       <dependency>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-reporting-utils</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 7c1fa10..a6ec5a8 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,17 +33,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 c95566c..8f6bfc4 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -80,8 +80,4 @@
             <artifactId>nifi-api</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 36a84ff..219284d 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-azure-bundle</artifactId>
@@ -99,8 +99,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 4e2b7e2..cd33dc7 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,29 +19,24 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-beats-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-beats-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-beats-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 a6f9325..225f34a9 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-beats-processors</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-listen</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -48,17 +48,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-socket-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flowfile-packager</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -93,8 +93,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
index 985dc3a..e97287b 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
@@ -19,20 +19,15 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-beats-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
         <module>nifi-beats-processors</module>
         <module>nifi-beats-nar</module>
     </modules>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 31b1932..e8dda78 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,41 +19,41 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cassandra-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <artifactId>nifi-utils</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <artifactId>nifi-record</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -70,30 +70,30 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -102,8 +102,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 02f515e..c004a22 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -52,9 +52,4 @@
             <artifactId>nifi-cassandra-processors</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 98a0bc6..0cef99d 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -96,8 +96,4 @@
             <version>1.8</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 97ea20f..bbfe734 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,31 +17,26 @@
     <parent>
         <artifactId>nifi-cassandra-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>nifi-cassandra-services-api-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 b64c7c8..53cfc06 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,9 +37,4 @@
             <version>${cassandra.sdk.version}</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 c936b38..3252854 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,23 +39,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 0854464..e19c179 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -54,26 +54,20 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
-
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
index afdead9..a2fa52f 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-cassandra-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <!-- Override jackson 2.7.9.3 from cassandra -->
             <dependency>
@@ -71,9 +71,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 ae5fc2f..0431182 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ccda-nar</artifactId>
@@ -35,9 +35,4 @@
             <artifactId>nifi-ccda-processors</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 feb5bf4..b59c7da 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ccda-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -77,12 +77,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
index 8be4f92..0192549 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-ccda-bundle</artifactId>
@@ -35,13 +35,8 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ccda-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 7751834..32d6bc1 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-cdc-api</artifactId>
@@ -41,8 +41,4 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 5c2668c..04c4492 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -38,8 +38,4 @@
             <artifactId>nifi-cdc-mysql-processors</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 307ba1b..a2bd29c 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -64,8 +64,4 @@ language governing permissions and limitations under the License. -->
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 461fa4d..d44c29f 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cdc-mysql-bundle</artifactId>
     <packaging>pom</packaging>
@@ -32,14 +32,8 @@
           <dependency>
               <groupId>org.apache.nifi</groupId>
               <artifactId>nifi-cdc-mysql-processors</artifactId>
-              <version>1.16.0</version>
+              <version>1.17.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-cdc/pom.xml b/nifi-nar-bundles/nifi-cdc/pom.xml
index 1d7471a..6fbb644 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cdc</artifactId>
     <packaging>pom</packaging>
@@ -26,8 +26,4 @@
         <module>nifi-cdc-api</module>
         <module>nifi-cdc-mysql-bundle</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 be8d8c6..74f1ec0 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-confluent-platform-nar</artifactId>
     <packaging>nar</packaging>
@@ -22,17 +22,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-schema-registry-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 3b9e927..b97a2f6 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -56,12 +56,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-web-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -72,8 +72,4 @@
             <url>https://packages.confluent.io/maven/</url>
         </repository>
     </repositories>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
index 47f5f76..e45b3a2 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.16.0</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nifi-confluent-platform-bundle</artifactId>
 	<packaging>pom</packaging>
@@ -35,8 +35,4 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 8447719..78ad06b 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,18 +34,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 b658e8d..40da331 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,12 +64,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 7207921..634e1b9 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-services-api-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,18 +34,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 200ea9d..101b2e2 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-couchbase-services-api</artifactId>
@@ -36,8 +36,4 @@
             <version>2.5.8</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
index 4f67d40..e23003d 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-couchbase-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -33,9 +33,4 @@
         <module>nifi-couchbase-processors</module>
         <module>nifi-couchbase-nar</module>
     </modules>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 353f292..ff01033 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cybersecurity-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-cybersecurity-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,12 +34,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cybersecurity-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 ef47a24..54e1a47 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,8 +73,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
index 927cf7b..df16ef1 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
@@ -19,21 +19,16 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-cybersecurity-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
         <module>nifi-cybersecurity-processors</module>
         <module>nifi-cybersecurity-nar</module>
     </modules>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 091fd44..0ab9566 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-datadog-nar</artifactId>
@@ -32,8 +32,4 @@
             <artifactId>nifi-datadog-reporting-task</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 1742633..4da6157 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.coursera</groupId>
@@ -81,12 +81,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
index 0b15bf8..2b29ba8 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.16.0</version>
+        <version>1.17.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.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
@@ -43,8 +43,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
index 0ff0fa8..895a9d0 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-druid-controller-service-api-nar</artifactId>
@@ -28,17 +28,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
index 6281ae9..c66f17e 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-druid-controller-service-api</artifactId>
@@ -97,8 +97,4 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
index e182261..ae885f2 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-druid-controller-service</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -65,12 +65,8 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
index bd417cf..06aa625 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
   
     <artifactId>nifi-druid-nar</artifactId>
@@ -28,22 +28,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
index f7e4ffc..d9c46a6 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-druid-processors</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -56,30 +56,26 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
index 2797b8d..3f0924f 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -18,11 +18,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-druid-bundle</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -182,8 +182,4 @@
         <module>nifi-druid-controller-service</module>
         <module>nifi-druid-processors</module>
     </modules>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 519c21c..642f6bd 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,12 +17,12 @@
     <parent>
         <artifactId>nifi-easyrules-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>nifi-easyrules-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -32,17 +32,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-easyrules-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 a240384..b89ad76 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jeasy</groupId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -105,9 +105,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
index a167117..6795a42 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,12 +33,8 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-easyrules-service</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 cdbaf3f..4d25b3e 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,18 +34,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 38c766d..045a831 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -56,8 +56,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 ffacc3f..2dd7c41 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-nar</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,18 +34,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 7dfbaa5..b0d96a8 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service</artifactId>
@@ -43,54 +43,54 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -172,13 +172,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -385,8 +385,4 @@
             </build>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 4fa6634..bd77555 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -37,8 +37,4 @@ language governing permissions and limitations under the License. -->
             <artifactId>nifi-elasticsearch-processors</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 70f8d50..8128442 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -61,25 +61,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -113,7 +113,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -130,8 +130,4 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 284554a..23a4583 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -30,18 +30,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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 2950554..c95ce5e 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
@@ -24,35 +24,35 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -62,7 +62,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,13 +73,13 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -101,25 +101,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -131,7 +131,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -149,8 +149,4 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
index a5d579b..02c2814 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -44,12 +44,12 @@ language governing permissions and limitations under the License. -->
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-elasticsearch-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <!-- Override commons-compress -->
             <dependency>
@@ -59,9 +59,4 @@ language governing permissions and limitations under the License. -->
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 42f30e6..42749d6 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -41,9 +41,5 @@
             <artifactId>nifi-email-processors</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
 
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 01f94b1..697baa9 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-email-processors</artifactId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -138,8 +138,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-email-bundle/pom.xml b/nifi-nar-bundles/nifi-email-bundle/pom.xml
index d10d93d..8e62297 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-email-bundle</artifactId>
@@ -34,12 +34,8 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-email-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 6161cb6..5a1ecd6 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-enrich-nar</artifactId>
     <packaging>nar</packaging>
@@ -40,8 +40,4 @@
             <artifactId>nifi-enrich-processors</artifactId>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 53ef2d0..57bd41b 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -140,19 +140,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -178,8 +178,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
index 799c5c8..6f1c5b6 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.16.0</version>
+        <version>1.17.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.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
             <!-- Override jackson -->
             <dependency>
@@ -55,8 +55,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 c462af2..6b6dc5a 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -37,9 +37,4 @@ language governing permissions and limitations under the License. -->
             <artifactId>nifi-evtx-processors</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 3d3db25..a93a9f7 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -65,8 +65,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
index 4452576..67d4f04 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -43,13 +43,8 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-evtx-processors</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 20ca14b..1889fe5 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bin-manager</artifactId>
     <packaging>jar</packaging>
@@ -30,11 +30,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 1eef4df..d23cde8 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,16 +18,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-database-test-utils</artifactId>
 
     <dependencies>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
\ No newline at end of file
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 f161411..b6027cd 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -128,8 +128,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 f9a8d15..88d548a 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-transport</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -57,8 +57,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 cc5dd12..09d772e 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -40,11 +40,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-transport</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 afbe34d..149c057 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-event-transport</artifactId>
     <packaging>jar</packaging>
@@ -30,17 +30,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 cf68eba..82f47b7 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,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-hadoop-utils</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -165,8 +165,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 86f5ea3..98d3403 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.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-kerberos-test-utils</artifactId>
@@ -27,22 +27,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </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 c4db91c..3e5219f 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -67,8 +67,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 24add30..42ad570 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <!-- The client -->
         <dependency>
@@ -92,8 +92,4 @@
             </dependencies>
         </profile>
     </profiles>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 20931ac..af371cd 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -38,8 +38,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 da6677b..d399f7d 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -83,8 +83,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 c38821b..4b34c52 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,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.16.0</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-hadoop-record-utils</artifactId>
-    <version>1.16.0</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <dependencyManagement>
         <dependencies>
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
         <!-- Other modules using nifi-hadoop-utils are expected to have the below dependencies available, typically through a NAR dependency -->
         <dependency>
@@ -93,9 +93,4 @@
             <artifactId>nifi-record</artifactId>
         </dependency>
     </dependencies>
-
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 d2b6a79..adf2de9 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.16.0</version>
+        <version>1.17.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.16.0</version>
+            <version>1.17.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.16.0</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -95,8 +95,4 @@
             </plugin>
         </plugins>
     </build>
-
-  <scm>
-    <tag>nifi-1.16.0-RC2</tag>
-  </scm>
 </project>
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 2492148..957df4b 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>
... 16330 lines suppressed ...

[nifi] 01/02: NIFI-9780-RC2 prepare release nifi-1.16.0-RC2

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch NIFI-9780-RC2
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit a680b3f093fc93197036fb43c08e75f6a3f21a18
Author: Joe Witt <jo...@apache.org>
AuthorDate: Tue Mar 15 10:21:23 2022 -0700

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

diff --git a/c2/c2-protocol/c2-protocol-api/pom.xml b/c2/c2-protocol/c2-protocol-api/pom.xml
index 8fc5135..ce18808 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>c2-protocol-api</artifactId>
@@ -31,8 +31,12 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-component-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/c2/c2-protocol/c2-protocol-component-api/pom.xml b/c2/c2-protocol/c2-protocol-component-api/pom.xml
index aa06fd0..c24e21c 100644
--- a/c2/c2-protocol/c2-protocol-component-api/pom.xml
+++ b/c2/c2-protocol/c2-protocol-component-api/pom.xml
@@ -15,13 +15,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>c2-protocol</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,4 +38,8 @@ limitations under the License.
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/c2/c2-protocol/pom.xml b/c2/c2-protocol/pom.xml
index 7ea54e6..d9c6baf 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>c2-protocol</artifactId>
@@ -31,4 +31,8 @@ limitations under the License.
         <module>c2-protocol-component-api</module>
         <module>c2-protocol-api</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/c2/pom.xml b/c2/pom.xml
index 870cff9..29dad8e 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>c2</artifactId>
@@ -36,7 +36,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml
index aed9f1a..65748a0 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-assembly</artifactId>
     <packaging>pom</packaging>
@@ -125,13 +125,13 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -389,4 +389,8 @@ limitations under the License.
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-bootstrap/pom.xml b/minifi/minifi-bootstrap/pom.xml
index 64743c4..fff0bc8 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-bootstrap</artifactId>
     <packaging>jar</packaging>
@@ -109,4 +109,8 @@ limitations under the License.
         </plugins>
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/minifi/minifi-c2/minifi-c2-api/pom.xml b/minifi/minifi-c2/minifi-c2-api/pom.xml
index a5362dd..6e17167 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-api</artifactId>
     <packaging>jar</packaging>
@@ -43,4 +43,8 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index fbcac96..28ab1b2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-assembly</artifactId>
     <packaging>pom</packaging>
@@ -184,4 +184,8 @@ limitations under the License.
             <type>war</type>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 c0fdabc..2e100da 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-cache-filesystem</artifactId>
     <packaging>jar</packaging>
@@ -38,4 +38,8 @@ limitations under the License.
             <scope>test</scope>
        </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 5ba6304..5330022 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-cache-s3</artifactId>
     <packaging>jar</packaging>
@@ -56,4 +56,8 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-cache/pom.xml b/minifi/minifi-c2/minifi-c2-cache/pom.xml
index 3be38af..ffea47b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-cache</artifactId>
     <packaging>pom</packaging>
@@ -29,4 +29,8 @@ limitations under the License.
         <module>minifi-c2-cache-filesystem</module>
 	<module>minifi-c2-cache-s3</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-docker/pom.xml b/minifi/minifi-c2/minifi-c2-docker/pom.xml
index 63e6bd3..b0d3733 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-c2-docker</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -76,4 +76,8 @@ limitations under the License.
             </build>
         </profile>
     </profiles>      
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml b/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
index 2f86bdc..90bcd1e 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-integration-tests</artifactId>
     <packaging>jar</packaging>
@@ -127,4 +127,8 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-jetty/pom.xml b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
index 0048585..3a05617 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-jetty</artifactId>
     <packaging>jar</packaging>
@@ -56,4 +56,8 @@ limitations under the License.
             <artifactId>jetty-servlets</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 b851bae..f6ecc77 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-provider-cache</artifactId>
     <packaging>jar</packaging>
@@ -37,4 +37,8 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 8de8505..0579f58 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-provider-delegating</artifactId>
     <packaging>jar</packaging>
@@ -50,4 +50,8 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 d6bf23b..441a42b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-provider-nifi-rest</artifactId>
     <packaging>jar</packaging>
@@ -79,4 +79,8 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 a2b10a3..fa1c1f8 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-provider-util</artifactId>
     <packaging>jar</packaging>
@@ -41,4 +41,8 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-provider/pom.xml b/minifi/minifi-c2/minifi-c2-provider/pom.xml
index 9c854b9..eef415f 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-provider</artifactId>
     <packaging>pom</packaging>
@@ -31,4 +31,8 @@ limitations under the License.
         <module>minifi-c2-provider-delegating</module>
         <module>minifi-c2-provider-nifi-rest</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml b/minifi/minifi-c2/minifi-c2-service/pom.xml
index 7d4b113..bcf7ecc 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2-service</artifactId>
     <packaging>war</packaging>
@@ -95,4 +95,8 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-c2/pom.xml b/minifi/minifi-c2/pom.xml
index a96aff4..5994d89 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-c2</artifactId>
     <packaging>pom</packaging>
@@ -48,4 +48,8 @@ limitations under the License.
         </dependencies>
     </dependencyManagement>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-commons/minifi-commons-schema/pom.xml b/minifi/minifi-commons/minifi-commons-schema/pom.xml
index 5d6d80f..28a03e5 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-commons-schema</artifactId>
@@ -34,4 +34,8 @@
             <artifactId>nifi-api</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-commons/minifi-utils/pom.xml b/minifi/minifi-commons/minifi-utils/pom.xml
index 9addae9..b49fe00 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-utils</artifactId>
@@ -30,4 +30,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-commons/pom.xml b/minifi/minifi-commons/pom.xml
index eff0c8d..e079725 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-commons</artifactId>
     <packaging>pom</packaging>
@@ -29,4 +29,8 @@ limitations under the License.
         <module>minifi-commons-schema</module>
         <module>minifi-utils</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-docker/pom.xml b/minifi/minifi-docker/pom.xml
index ada7709..c7d3f16 100644
--- a/minifi/minifi-docker/pom.xml
+++ b/minifi/minifi-docker/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-docker</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -76,4 +76,8 @@ limitations under the License.
             </build>
         </profile>
     </profiles>      
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-docs/pom.xml b/minifi/minifi-docs/pom.xml
index 79f3b30..141fb9d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>minifi-docs</artifactId>
@@ -68,4 +68,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-integration-tests/pom.xml b/minifi/minifi-integration-tests/pom.xml
index 4512f5e..b45d040 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-integration-tests</artifactId>
     <packaging>jar</packaging>
@@ -141,4 +141,8 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 1b6186e..7c1eb5f 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -112,4 +112,8 @@ limitations under the License.
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 2b1b1f2..b15c1e3 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-framework-api</artifactId>
@@ -29,19 +29,23 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-headless-server</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 df292ce..96e8cd2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-framework-core</artifactId>
@@ -29,7 +29,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -110,4 +110,8 @@ limitations under the License.
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 fb63f2c..9a13226 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-resources</artifactId>
     <packaging>pom</packaging>
@@ -49,4 +49,8 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 d0d115e..66b47f1 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-runtime</artifactId>
@@ -64,4 +64,8 @@ limitations under the License.
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 adf9c47..8061e7b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-server</artifactId>
     <packaging>jar</packaging>
@@ -64,6 +64,10 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
 
 
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 643237e..cc1f4b2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-framework</artifactId>
     <packaging>pom</packaging>
@@ -37,4 +37,8 @@ limitations under the License.
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 5c639ac..d76dce1 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-headless-server</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <!-- mark these nifi artifacts as provided since it is included in the lib -->
         <dependency>
@@ -80,4 +80,8 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
index 1056ca6..a3a768f 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,44 +37,48 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-headless-server</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar-loading-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-properties-loader</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-mock</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 11c2d64..3ff1ca8 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-provenance-repositories</artifactId>
@@ -32,4 +32,8 @@ limitations under the License.
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 b237bb1..e33dc1e 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-provenance-repository-nar</artifactId>
@@ -37,4 +37,8 @@ limitations under the License.
             <type>nar</type>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 f90c276..73e9b76 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>minifi-provenance-repository-bundle</artifactId>
@@ -32,4 +32,8 @@ limitations under the License.
         <module>minifi-provenance-repositories</module>
     </modules>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
index c2a5366..34146b4 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -49,12 +49,16 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-prioritizers</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-reporting-tasks</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 8787432..5688f0c 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,12 +33,16 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-processor</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-model</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/minifi/minifi-nar-bundles/pom.xml b/minifi/minifi-nar-bundles/pom.xml
index bf3df2c..c74c804 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-nar-bundles</artifactId>
@@ -32,4 +32,8 @@ limitations under the License.
         <module>minifi-update-attribute-nar</module>
         <module>minifi-standard-nar</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
index 9b6e869..be0a421 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-toolkit-assembly</artifactId>
     <packaging>pom</packaging>
@@ -63,4 +63,8 @@ limitations under the License.
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
index 15887cd..b1c52b3 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-toolkit-configuration</artifactId>
     <packaging>jar</packaging>
@@ -50,4 +50,8 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/minifi-toolkit/pom.xml b/minifi/minifi-toolkit/pom.xml
index 004e3d8..cdaef2e 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>minifi-toolkit</artifactId>
     <packaging>pom</packaging>
@@ -29,4 +29,8 @@ limitations under the License.
         <module>minifi-toolkit-configuration</module>
         <module>minifi-toolkit-assembly</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 7141584..90f6de0 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
     <description>Apache NiFi - MiNiFi is a child project effort to aid in the collection and transmission of data close to where it is created.</description>
 
@@ -65,37 +65,37 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-bootstrap-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-bootstrap</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-core</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-resources</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-provenance-repository-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
@@ -103,45 +103,45 @@ limitations under the License.
                 <artifactId>minifi-resources</artifactId>
                 <classifier>resources</classifier>
                 <type>zip</type>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-runtime</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-framework-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-standard-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-server-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-update-attribute-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-docs</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -149,7 +149,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi.minifi</groupId>
                 <artifactId>minifi-provenance-repositories</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
 
             <dependency>
@@ -228,77 +228,77 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-client</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-expression-language</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-web-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-custom-ui-utilities</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ui-extension</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-flowfile-packager</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-socket-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-data-provenance-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-provenance-repository-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-runtime</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-toolkit-tls</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-resources</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -306,7 +306,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-docs</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>
@@ -314,148 +314,148 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-core</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-provenance-repository-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-services-api-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-jetty-bundle</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-headless-server-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-update-attribute-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-kerberos-credentials-service-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-properties</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-security-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-logging-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nar-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-hadoop-utils</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-mock</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-write-ahead-log</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-standard-prioritizers</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-administration</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-framework-core-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-persistent-provenance-repository</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ssl-context-service</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-reporting-task</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-site-to-site-reporting-nar</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
                 <type>nar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
 
             <!-- Test Dependencies -->
diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml
index 99838e2..5b908ea 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-api</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 86fd60d..1f6c649 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-assembly</artifactId>
     <packaging>pom</packaging>
@@ -140,38 +140,38 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-resources</artifactId>
             <classifier>resources</classifier>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>runtime</scope>
             <type>zip</type>
         </dependency>
@@ -179,655 +179,655 @@ language governing permissions and limitations under the License. -->
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-docs</artifactId>
             <classifier>resources</classifier>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>runtime</scope>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-provenance-repository-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-services-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-datadog-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-update-attribute-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-libraries-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-1-0-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-2-0-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-2-6-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-platform-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-http-context-map-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-html-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-services-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-poi-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kudu-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ldap-iaa-providers-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-iaa-providers-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-single-user-iaa-providers-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dbcp-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-dbcp-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
 	<dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-services-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-solr-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-social-media-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hl7-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ccda-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-language-translation-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-enrich-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-geohash-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ambari-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-rethinkdb-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-prometheus-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-influxdb-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-network-processors-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-riemann-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase_1_1_2-client-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase_2-client-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-oauth2-provider-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-scripting-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-groovyx-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-restapi-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cybersecurity-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-email-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-amqp-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-splunk-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jms-cf-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jms-processors-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-spring-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-registry-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hive-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hive-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-reporting-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mqtt-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-snmp-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-evtx-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-slack-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-smb-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-windows-event-log-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-services-jetty-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-websocket-processors-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-tcp-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-gcp-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateful-analysis-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cdc-mysql-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parquet-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pgp-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hwx-schema-registry-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-redis-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-redis-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hazelcast-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hazelcast-services-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics-reporter-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics-reporting-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
 	    <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-user-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jolt-record-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-sink-service-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hashicorp-vault-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-processor-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 -->
@@ -863,25 +863,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.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-neo4j-cypher-service-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-graph-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-other-graph-services-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -898,7 +898,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-grpc-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -915,7 +915,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-atlas-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -932,7 +932,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive_1_1-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -949,7 +949,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-hive3-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -965,7 +965,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-media-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -980,13 +980,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-easyrules-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-rules-action-handler-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1001,19 +1001,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-sql-reporting-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-easyrules-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-rules-action-handler-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1028,14 +1028,14 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-server-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-headless-server-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1050,19 +1050,19 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
 	    	</dependency>
 		<dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-services-api-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
 		</dependency>
 		<dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-accumulo-services-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1261,13 +1261,13 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-ranger-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-ranger-resources</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -1280,7 +1280,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-asn1-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
@@ -1294,7 +1294,7 @@ language governing permissions and limitations under the License. -->
                 <dependency>
                     <groupId>org.apache.nifi</groupId>
                     <artifactId>nifi-snowflake-services-nar</artifactId>
-                    <version>1.16.0-SNAPSHOT</version>
+                    <version>1.16.0</version>
                     <type>nar</type>
                 </dependency>
             </dependencies>
diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml
index acd40ca..9871216 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-bootstrap</artifactId>
     <packaging>jar</packaging>
@@ -27,34 +27,34 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-bootstrap-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flow-encryptor</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-single-user-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -86,12 +86,12 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties-loader</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</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 c27062b..25a0aa2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-bootstrap-utils</artifactId>
     <packaging>jar</packaging>
@@ -32,4 +32,8 @@ language governing permissions and limitations under the License. -->
             <version>5.10.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi-commons/nifi-data-provenance-utils/pom.xml
index b0ec2a2..62575e1 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-data-provenance-utils</artifactId>
     <packaging>jar</packaging>
@@ -25,17 +25,21 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml
index d451a33..afb5955 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-expression-language</artifactId>
     <packaging>jar</packaging>
@@ -61,22 +61,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parameter</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-uuid5</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -108,4 +108,8 @@
             <version>1.14</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-flow-encryptor/pom.xml b/nifi-commons/nifi-flow-encryptor/pom.xml
index 3b63ec5..68a4097 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-flow-encryptor</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-encryptor</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <exclusions>
                 <!-- Excluded to avoid unnecessary runtime dependencies -->
                 <exclusion>
@@ -35,4 +35,8 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml
index 540f0a9..e746a03 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-flowfile-packager</artifactId>
     <packaging>jar</packaging>
@@ -37,4 +37,8 @@
             <version>1.8</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml
index 57e73df..e47c03d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-hl7-query-language</artifactId>
@@ -109,4 +109,8 @@
             <version>2.3</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml
index 78bf745..80f007a 100644
--- a/nifi-commons/nifi-json-utils/pom.xml
+++ b/nifi-commons/nifi-json-utils/pom.xml
@@ -18,16 +18,16 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-json-utils</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -42,4 +42,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-logging-utils/pom.xml b/nifi-commons/nifi-logging-utils/pom.xml
index 9f314c3..a996526 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-logging-utils</artifactId>
     <description>Utilities for logging</description>
@@ -28,4 +28,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml
index f06066a..f347c61 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
@@ -76,4 +76,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-commons/nifi-parameter/pom.xml b/nifi-commons/nifi-parameter/pom.xml
index 5e5b156..204f426 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,8 +28,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-commons/nifi-properties/pom.xml b/nifi-commons/nifi-properties/pom.xml
index c3c180f..cc02bb4 100644
--- a/nifi-commons/nifi-properties/pom.xml
+++ b/nifi-commons/nifi-properties/pom.xml
@@ -19,14 +19,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-properties</artifactId>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-encryptor/pom.xml b/nifi-commons/nifi-property-encryptor/pom.xml
index fc727b0..6f401ca 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-encryptor</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -41,4 +41,8 @@
             <version>1.14</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-api/pom.xml b/nifi-commons/nifi-property-protection-api/pom.xml
index a10401b..c0cd105 100644
--- a/nifi-commons/nifi-property-protection-api/pom.xml
+++ b/nifi-commons/nifi-property-protection-api/pom.xml
@@ -18,14 +18,18 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-api</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-aws/pom.xml b/nifi-commons/nifi-property-protection-aws/pom.xml
index fab0806..b67faa2 100644
--- a/nifi-commons/nifi-property-protection-aws/pom.xml
+++ b/nifi-commons/nifi-property-protection-aws/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-aws</artifactId>
     <properties>
@@ -28,12 +28,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -80,4 +80,8 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml
index 72c8c5c..5e599bd 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -18,19 +18,19 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-azure</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
@@ -109,4 +109,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-cipher/pom.xml b/nifi-commons/nifi-property-protection-cipher/pom.xml
index c30dcf7..d180f2c 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-cipher</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -33,4 +33,8 @@
             <version>1.15</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-factory/pom.xml b/nifi-commons/nifi-property-protection-factory/pom.xml
index 2753074..a4abfae 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-factory</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-aws</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-azure</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-cipher</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-gcp</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-hashicorp</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -79,4 +79,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml
index c7e7388..eeaf1b2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-shared</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -61,4 +61,8 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-hashicorp/pom.xml b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
index 6c6fff1..a012b4a 100644
--- a/nifi-commons/nifi-property-protection-hashicorp/pom.xml
+++ b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
@@ -18,19 +18,19 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-hashicorp</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-vault-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -41,4 +41,8 @@
             <artifactId>spring-core</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-protection-shared/pom.xml b/nifi-commons/nifi-property-protection-shared/pom.xml
index cddf0a8..a1a5c2a 100644
--- a/nifi-commons/nifi-property-protection-shared/pom.xml
+++ b/nifi-commons/nifi-property-protection-shared/pom.xml
@@ -18,14 +18,18 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-protection-shared</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-property-utils/pom.xml b/nifi-commons/nifi-property-utils/pom.xml
index 0cc3118..6193222 100644
--- a/nifi-commons/nifi-property-utils/pom.xml
+++ b/nifi-commons/nifi-property-utils/pom.xml
@@ -18,7 +18,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-property-utils</artifactId>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index 11234a1..d0c6b15 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.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
   </parent>
 
   <artifactId>nifi-record-path</artifactId>
@@ -59,22 +59,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-uuid5</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
@@ -97,4 +97,8 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-record/pom.xml b/nifi-commons/nifi-record/pom.xml
index 15ee691..623ec99 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-record</artifactId>
@@ -27,4 +27,8 @@
         several interfaces for interacting with Records. This module should not depend
         on any external libraries.
     </description>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-repository-encryption/pom.xml b/nifi-commons/nifi-repository-encryption/pom.xml
index 99076e1..159e50b 100644
--- a/nifi-commons/nifi-repository-encryption/pom.xml
+++ b/nifi-commons/nifi-repository-encryption/pom.xml
@@ -18,28 +18,32 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-repository-encryption</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kms</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-rocksdb-utils/pom.xml b/nifi-commons/nifi-rocksdb-utils/pom.xml
index bd72ea3..bb3e229 100644
--- a/nifi-commons/nifi-rocksdb-utils/pom.xml
+++ b/nifi-commons/nifi-rocksdb-utils/pom.xml
@@ -18,21 +18,21 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-rocksdb-utils</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.rocksdb</groupId>
@@ -45,4 +45,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml
index 2fcd923..56b0090 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-schema-utils</artifactId>
     <dependencies>
@@ -27,5 +27,9 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-security-kerberos-api/pom.xml b/nifi-commons/nifi-security-kerberos-api/pom.xml
index 5b1940d..11dc8da 100644
--- a/nifi-commons/nifi-security-kerberos-api/pom.xml
+++ b/nifi-commons/nifi-security-kerberos-api/pom.xml
@@ -18,7 +18,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-security-kerberos-api</artifactId>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-kerberos/pom.xml b/nifi-commons/nifi-security-kerberos/pom.xml
index 9a8d1c5..9e9f58a 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-security-kerberos</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -53,4 +53,8 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-kms/pom.xml b/nifi-commons/nifi-security-kms/pom.xml
index 9149221..95dd0ce 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-security-kms</artifactId>
     <dependencies>
@@ -28,4 +28,8 @@
             <version>1.15</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-socket-ssl/pom.xml b/nifi-commons/nifi-security-socket-ssl/pom.xml
index 996f07a..78633ef 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-security-socket-ssl</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -43,4 +43,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-security-utils-api/pom.xml b/nifi-commons/nifi-security-utils-api/pom.xml
index bc6a518..849fd56 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-security-utils-api</artifactId>
     <description>
@@ -28,5 +28,9 @@
     <!--
     This module cannot have any external dependencies as it is referred to by many *-api modules
       -->
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index db5818b..174f59c 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-security-utils</artifactId>
     <description>
@@ -30,22 +30,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kms</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>at.favre.lib</groupId>
@@ -132,5 +132,9 @@
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-single-user-utils/pom.xml b/nifi-commons/nifi-single-user-utils/pom.xml
index d0e9c5e..48bd774 100644
--- a/nifi-commons/nifi-single-user-utils/pom.xml
+++ b/nifi-commons/nifi-single-user-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-single-user-utils</artifactId>
     <dependencies>
@@ -34,4 +34,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml
index 582026d..37bdb41 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-site-to-site-client</artifactId>
@@ -34,22 +34,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-client-dto</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>${httpclient.group}</groupId>
@@ -144,4 +144,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml
index 52ce5ae..4e604e0 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-logging-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
@@ -54,7 +54,11 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml
index 95551d3..5487e03 100644
--- a/nifi-commons/nifi-utils/pom.xml
+++ b/nifi-commons/nifi-utils/pom.xml
@@ -18,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-utils</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
     <description>
         This nifi-utils module should be a general purpose place to store widely
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
     <profiles>
@@ -61,4 +61,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-uuid5/pom.xml b/nifi-commons/nifi-uuid5/pom.xml
index 9a2d125..4e05792 100644
--- a/nifi-commons/nifi-uuid5/pom.xml
+++ b/nifi-commons/nifi-uuid5/pom.xml
@@ -31,7 +31,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-uuid5</artifactId>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-vault-utils/pom.xml b/nifi-commons/nifi-vault-utils/pom.xml
index a80aee1..97b4306 100644
--- a/nifi-commons/nifi-vault-utils/pom.xml
+++ b/nifi-commons/nifi-vault-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-vault-utils</artifactId>
     <properties>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <!-- Runtime dependency to enable TLS client configuration -->
         <dependency>
@@ -59,15 +59,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
 
diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml
index c5e3bb4..4bb02f6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-web-utils</artifactId>
     <dependencies>
@@ -79,4 +79,8 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi-commons/nifi-write-ahead-log/pom.xml
index 7efd011..51e3c15b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-write-ahead-log</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,11 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-commons/pom.xml b/nifi-commons/pom.xml
index c073576..c81b2ea 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-commons</artifactId>
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index b445572..ae1bbdf 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>dockerhub</artifactId>
@@ -136,4 +136,8 @@
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index 590596a..c76d120 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>dockermaven</artifactId>
@@ -190,4 +190,8 @@
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-docker/pom.xml b/nifi-docker/pom.xml
index 5a81791..c1a4762 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-docker</artifactId>
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index 4e9b0e9..f3246a6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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 615f776..f3f1630 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-nifi-example-nar</artifactId>
@@ -36,4 +36,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 5816f5c..ff5e23f 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-nifi-example-processors</artifactId>
@@ -29,12 +29,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -56,4 +56,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-external/nifi-example-bundle/pom.xml b/nifi-external/nifi-example-bundle/pom.xml
index c90d3d2..af40338 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-example-bundle</artifactId>
@@ -35,8 +35,12 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nifi-example-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 220c369..27f451d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,22 +27,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-connector</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
 
@@ -64,27 +64,27 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-nar-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <!-- SLF4J bridges to include -->
@@ -108,13 +108,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
 
@@ -174,4 +174,8 @@
         </plugins>
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 2bb4e61..f761b23 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
 
@@ -105,4 +105,8 @@
         </plugins>
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 7e702bb..5081383 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,22 +33,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-bootstrap</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
 
@@ -70,39 +70,39 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-server-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-nar-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-jetty-bundle</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
 
@@ -125,4 +125,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-external/nifi-kafka-connect/pom.xml b/nifi-external/nifi-kafka-connect/pom.xml
index 7c99a7f..19ff360 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,4 +30,8 @@
         <module>nifi-kafka-connector-tests</module>
     </modules>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml
index 2aa6806..cf342d5 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-spark-receiver</artifactId>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-client</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -92,4 +92,8 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-external/pom.xml b/nifi-external/pom.xml
index 98ba726..3481dbf 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-external</artifactId>
diff --git a/nifi-framework-api/pom.xml b/nifi-framework-api/pom.xml
index 631897c..515c2d5 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</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 18e34ca..a5396a9 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-h2-database-migrator</artifactId>
 
@@ -31,7 +31,11 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-h2-database</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-h2/nifi-h2-database/pom.xml b/nifi-h2/nifi-h2-database/pom.xml
index feb24b0..4f29572 100644
--- a/nifi-h2/nifi-h2-database/pom.xml
+++ b/nifi-h2/nifi-h2-database/pom.xml
@@ -14,11 +14,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-h2</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-h2-database</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -67,4 +67,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-h2/pom.xml b/nifi-h2/pom.xml
index 7588627..8592b9b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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 ca095d7..d5ab2e6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-extension-manifest-model</artifactId>
     <packaging>jar</packaging>
@@ -52,4 +52,8 @@
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-manifest/nifi-extension-manifest-parser/pom.xml b/nifi-manifest/nifi-extension-manifest-parser/pom.xml
index 5f16d6d..43c435d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
@@ -48,4 +48,8 @@
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-manifest/nifi-runtime-manifest-core/pom.xml b/nifi-manifest/nifi-runtime-manifest-core/pom.xml
index 7eda4f5..0b548a2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-model</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-extension-manifest-parser</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -50,4 +50,8 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-manifest/nifi-runtime-manifest-test/pom.xml b/nifi-manifest/nifi-runtime-manifest-test/pom.xml
index 7e70bf8..fd36189 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-runtime-manifest-core</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -60,4 +60,8 @@
         </plugins>
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-manifest/nifi-runtime-manifest/pom.xml b/nifi-manifest/nifi-runtime-manifest/pom.xml
index 4ef197b..3eaa366 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <classifier>manifests</classifier>
             <type>zip</type>
             <optional>true</optional>
@@ -128,7 +128,7 @@
                     <dependency>
                         <groupId>org.apache.nifi</groupId>
                         <artifactId>nifi-runtime-manifest-core</artifactId>
-                        <version>1.16.0-SNAPSHOT</version>
+                        <version>1.16.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -152,4 +152,8 @@
         </profile>
     </profiles>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-manifest/pom.xml b/nifi-manifest/pom.xml
index 6b76fe3..48c8daf 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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 4645077..457aae5 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-processor-bundle-archetype</artifactId>
@@ -69,4 +69,8 @@
         </pluginManagement>
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
index dafc39d..ac8fc7e 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-service-bundle-archetype</artifactId>
@@ -65,4 +65,8 @@
         
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-maven-archetypes/pom.xml b/nifi-maven-archetypes/pom.xml
index 6a12773..5ce20cf 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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 2491ffd..5dda257 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-mock</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-parameter</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-core-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>asm</groupId>
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-data-provenance-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</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 0182e13..2a25f7f 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-accumulo-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,19 +34,23 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 124aaa4..2eb6aec 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -52,34 +52,34 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
@@ -100,14 +100,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 6d41937..7ca55db 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-api-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,19 +34,23 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 8c67bb9..649ee59 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-api</artifactId>
@@ -45,23 +45,27 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 727b367..5b9ec5a 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-accumulo-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-accumulo-services-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,20 +34,24 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
            <artifactId>nifi-accumulo-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 ff1951e..8c64924 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-accumulo-services</artifactId>
@@ -37,58 +37,62 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-accumulo-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-user-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index d1481ce..40b54bd 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <properties>
@@ -23,7 +23,7 @@
     </properties>
 
     <artifactId>nifi-accumulo-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-accumulo-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <!-- Override commons-io:2.6 from accumulo-core -->
             <dependency>
@@ -86,4 +86,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 8067b70..af4a498 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-ambari-nar</artifactId>
@@ -30,7 +30,11 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ambari-reporting-task</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 78fc57a..ab00d2b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-ambari-reporting-task</artifactId>
@@ -41,24 +41,28 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
index 9a45a64..168b220 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-ambari-bundle</artifactId>
@@ -38,4 +38,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 2720302..3db40b1 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,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-amqp-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-amqp-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -39,4 +39,8 @@
             <artifactId>nifi-amqp-processors</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 93ecd99..65241be 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -77,4 +77,8 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
index 3a23a54..f03fe00 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
@@ -18,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-amqp-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
     <description>A bundle of processors that publish to and consume messages from AMQP.</description>
     <modules>
@@ -33,8 +33,12 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-amqp-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 2744a41..1338db7 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,15 +32,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-asn1-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 c310ebd..3328702 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.beanit</groupId>
@@ -156,4 +156,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
index 0022301..b04e130 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,4 +27,8 @@
         <module>nifi-asn1-services</module>
         <module>nifi-asn1-nar</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 f538e4a..b4e2095 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-atlas-nar</artifactId>
@@ -37,9 +37,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 ddc354f..4080aaa 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-atlas-reporting-task</artifactId>
@@ -41,12 +41,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-reporting-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -138,4 +138,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index 987a3fb..7aab846 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
 
             <dependency>
@@ -89,4 +89,8 @@
         </dependencies>
     </dependencyManagement>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 f8eced6..999060f 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-avro-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-avro-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,8 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 f0bab53..6165b46 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -53,7 +53,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -72,4 +72,8 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
index c6c3d53..d5a88ca 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-avro-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -42,4 +42,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 101c492..2eb9cb6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-aws-abstract-processors</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -129,4 +129,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 28d81e2..ba78294 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-aws-nar</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-parameter-value-providers</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -52,4 +52,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 6f59d98..6e70505 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-stateless-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -53,8 +53,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 7af8db6..4a08695 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-aws-processors</artifactId>
@@ -36,17 +36,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-abstract-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -108,13 +108,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -137,4 +137,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 6c108a2..3738857 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-aws-service-api-nar</artifactId>
@@ -33,14 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 0793e27..e8ee725 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -51,4 +51,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 42269c4..6b3672f 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-aws-bundle</artifactId>
@@ -72,4 +72,8 @@
         <module>nifi-aws-parameter-value-providers</module>
     </modules>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 fe27f96..9ec9685 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.graph</groupId>
@@ -51,4 +51,8 @@
             <version>${msal4j.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 83da0de..1d47a5d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-azure-nar</artifactId>
@@ -33,17 +33,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-reporting-task</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-graph-authorizer</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <exclusions>
                 <!-- Exclude Guava provided in nifi-azure-services-api-nar -->
                 <exclusion>
@@ -55,9 +55,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 4a14fd2..38fefb3 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-azure-processors</artifactId>
     <packaging>jar</packaging>
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-service-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -178,38 +178,38 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-listed-entity</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -242,4 +242,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 4a529f3..be654f7 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-azure-reporting-task</artifactId>
     <packaging>jar</packaging>
@@ -25,17 +25,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -63,14 +63,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     
       <dependency>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-reporting-utils</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
       </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 49f4ed4..7c1fa10 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,13 +33,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-azure-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 11f8f91..c95566c 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -80,4 +80,8 @@
             <artifactId>nifi-api</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index e18c5a1..36a84ff 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-azure-bundle</artifactId>
@@ -99,4 +99,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 ba6dba3..4e2b7e2 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,25 +19,29 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-beats-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-beats-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-beats-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 e3c53c7..a6f9325 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-beats-processors</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-listen</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -48,17 +48,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-socket-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-flowfile-packager</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -93,4 +93,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
index b4518ed..985dc3a 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-beats-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -31,4 +31,8 @@
         <module>nifi-beats-nar</module>
     </modules>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 aab4ff5..31b1932 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,41 +19,41 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cassandra-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <artifactId>nifi-utils</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <artifactId>nifi-record</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -70,30 +70,30 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -102,4 +102,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 df6d676..02f515e 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -53,4 +53,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 93df3ed..98a0bc6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-cassandra-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -96,4 +96,8 @@
             <version>1.8</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 0a86d6b..97ea20f 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,27 +17,31 @@
     <parent>
         <artifactId>nifi-cassandra-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>nifi-cassandra-services-api-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 2aa60f6..b64c7c8 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,4 +38,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 5ae56fa..c936b38 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,19 +39,23 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 2d3d2b8..0854464 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,13 +29,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
@@ -54,22 +54,26 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
 
     </dependencies>
 
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
index 2234483..afdead9 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <properties>
@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-cassandra-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <!-- Override jackson 2.7.9.3 from cassandra -->
             <dependency>
@@ -72,4 +72,8 @@
         </dependencies>
     </dependencyManagement>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 c2a84a2..ae5fc2f 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-ccda-nar</artifactId>
@@ -36,4 +36,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 ef42299..feb5bf4 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-ccda-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -77,8 +77,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
index 2a93ae0..8be4f92 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-ccda-bundle</artifactId>
@@ -35,9 +35,13 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-ccda-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 b2cd314..7751834 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     
     <artifactId>nifi-cdc-api</artifactId>
@@ -41,4 +41,8 @@
             <version>${jackson.version}</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 1b2f9b3..5c2668c 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -38,4 +38,8 @@
             <artifactId>nifi-cdc-mysql-processors</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 2ac7ed8..307ba1b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -64,4 +64,8 @@ language governing permissions and limitations under the License. -->
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 4714c94..461fa4d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-cdc-mysql-bundle</artifactId>
     <packaging>pom</packaging>
@@ -32,10 +32,14 @@
           <dependency>
               <groupId>org.apache.nifi</groupId>
               <artifactId>nifi-cdc-mysql-processors</artifactId>
-              <version>1.16.0-SNAPSHOT</version>
+              <version>1.16.0</version>
           </dependency>
         </dependencies>
     </dependencyManagement>
 
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-cdc/pom.xml b/nifi-nar-bundles/nifi-cdc/pom.xml
index c41e3d7..1d7471a 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-cdc</artifactId>
     <packaging>pom</packaging>
@@ -26,4 +26,8 @@
         <module>nifi-cdc-api</module>
         <module>nifi-cdc-mysql-bundle</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 e7bbf96..be8d8c6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-confluent-platform-nar</artifactId>
     <packaging>nar</packaging>
@@ -22,13 +22,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-confluent-schema-registry-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 600b3cc..3b9e927 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -56,12 +56,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-web-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -72,4 +72,8 @@
             <url>https://packages.confluent.io/maven/</url>
         </repository>
     </repositories>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
index 8907cb2..47f5f76 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.16.0-SNAPSHOT</version>
+		<version>1.16.0</version>
 	</parent>
 	<artifactId>nifi-confluent-platform-bundle</artifactId>
 	<packaging>pom</packaging>
@@ -35,4 +35,8 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 caef88b..8447719 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-couchbase-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,14 +34,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 1a4c21d..b658e8d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-couchbase-processors</artifactId>
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,8 +64,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 5da9411..7207921 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-couchbase-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-couchbase-services-api-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,14 +34,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-couchbase-services-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 815b01a..200ea9d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-couchbase-services-api</artifactId>
@@ -36,4 +36,8 @@
             <version>2.5.8</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
index 23787cc..4f67d40 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-couchbase-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -34,4 +34,8 @@
         <module>nifi-couchbase-nar</module>
     </modules>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 1e2ccf1..353f292 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-cybersecurity-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-cybersecurity-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,8 +34,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cybersecurity-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 52e3e2e..ef47a24 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-cybersecurity-processors</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>info.debatty</groupId>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,4 +73,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
index 740b160..927cf7b 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-cybersecurity-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -32,4 +32,8 @@
         <module>nifi-cybersecurity-nar</module>
     </modules>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 9ab9d93..091fd44 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-datadog-nar</artifactId>
@@ -32,4 +32,8 @@
             <artifactId>nifi-datadog-reporting-task</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 b307223..1742633 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-datadog-reporting-task</artifactId>
@@ -46,12 +46,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.coursera</groupId>
@@ -81,8 +81,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
index dd3b808..0b15bf8 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
@@ -43,4 +43,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
index 3ba92f4..0ff0fa8 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-druid-controller-service-api-nar</artifactId>
@@ -28,13 +28,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
index a581a38..6281ae9 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-druid-controller-service-api</artifactId>
@@ -97,4 +97,8 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
index 1b89cd9..e182261 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-druid-controller-service</artifactId>
@@ -33,18 +33,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -65,8 +65,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
index ca3f7df..bd417cf 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
   
     <artifactId>nifi-druid-nar</artifactId>
@@ -28,18 +28,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
index be798a9..f7e4ffc 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-druid-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-druid-processors</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -56,26 +56,30 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-druid-controller-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-druid-bundle/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
index cff1cd4..2797b8d 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -18,11 +18,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-druid-bundle</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -182,4 +182,8 @@
         <module>nifi-druid-controller-service</module>
         <module>nifi-druid-processors</module>
     </modules>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 b62f24d..519c21c 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,12 +17,12 @@
     <parent>
         <artifactId>nifi-easyrules-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>nifi-easyrules-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -32,13 +32,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-easyrules-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 4a86abf..a240384 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.jeasy</groupId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -106,4 +106,8 @@
         </plugins>
     </build>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
index 50d4240..a167117 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,8 +33,12 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-easyrules-service</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 f368912..cdbaf3f 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,14 +34,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 9c7160c..38c766d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -56,4 +56,8 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 51c9a7f..ffacc3f 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,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-elasticsearch-bundle</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service-nar</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,14 +34,18 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 91a277a..7dfbaa5 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-client-service</artifactId>
@@ -43,54 +43,54 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-distributed-cache-client-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-proxy-configuration-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -172,13 +172,13 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -385,4 +385,8 @@
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 d476acd..4fa6634 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -37,4 +37,8 @@ language governing permissions and limitations under the License. -->
             <artifactId>nifi-elasticsearch-processors</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 53dad5c..70f8d50 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -61,25 +61,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -113,7 +113,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
@@ -130,4 +130,8 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 10889d9..284554a 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -30,14 +30,18 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 67de26c..2950554 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
@@ -24,35 +24,35 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-schema-registry-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -62,7 +62,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,13 +73,13 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-json-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -101,25 +101,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-standard-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -131,7 +131,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-elasticsearch-client-service</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -149,4 +149,8 @@ language governing permissions and limitations under the License. -->
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
index 37703de..a5d579b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -44,12 +44,12 @@ language governing permissions and limitations under the License. -->
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-elasticsearch-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-elasticsearch-restapi-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <!-- Override commons-compress -->
             <dependency>
@@ -60,4 +60,8 @@ language governing permissions and limitations under the License. -->
         </dependencies>
     </dependencyManagement>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 80eae5d..42f30e6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -41,5 +41,9 @@
             <artifactId>nifi-email-processors</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
 
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 d2e7819..01f94b1 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-email-processors</artifactId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -138,4 +138,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-email-bundle/pom.xml b/nifi-nar-bundles/nifi-email-bundle/pom.xml
index fe53140..d10d93d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-email-bundle</artifactId>
@@ -34,8 +34,12 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-email-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 3a0e537..6161cb6 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-enrich-nar</artifactId>
     <packaging>nar</packaging>
@@ -40,4 +40,8 @@
             <artifactId>nifi-enrich-processors</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 1f5da46..53ef2d0 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -140,19 +140,19 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-path</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record-serialization-services</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -178,4 +178,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
index ab1fde0..799c5c8 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-enrich-bundle</artifactId>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-enrich-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
             <!-- Override jackson -->
             <dependency>
@@ -55,4 +55,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 b16bfc5..c462af2 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -38,4 +38,8 @@ language governing permissions and limitations under the License. -->
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 8a83a91..3d3db25 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-evtx-processors</artifactId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -65,4 +65,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
index 84f4c68..4452576 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <groupId>org.apache.nifi</groupId>
@@ -43,9 +43,13 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-evtx-processors</artifactId>
-                <version>1.16.0-SNAPSHOT</version>
+                <version>1.16.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 eac71e2..20ca14b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-bin-manager</artifactId>
     <packaging>jar</packaging>
@@ -30,7 +30,11 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 65a5f67..1eef4df 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-database-test-utils</artifactId>
@@ -26,4 +26,8 @@
     <dependencies>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
\ No newline at end of file
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 e037fb8..f161411 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -128,4 +128,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 ce42ed0..f9a8d15 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-transport</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -57,4 +57,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 5b26e7f..cc5dd12 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -40,7 +40,11 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-event-transport</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 3491cca..afbe34d 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-event-transport</artifactId>
     <packaging>jar</packaging>
@@ -30,13 +30,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 e7443d1..cf68eba 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,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-extension-utils</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-hadoop-utils</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-kerberos</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -165,4 +165,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 77072bc..86f5ea3 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
 
     <artifactId>nifi-kerberos-test-utils</artifactId>
@@ -27,18 +27,22 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kerberos-credentials-service-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </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 c5d7bfd..c4db91c 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -67,4 +67,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 bc1cc99..24add30 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-metrics</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <!-- The client -->
         <dependency>
@@ -92,4 +92,8 @@
             </dependencies>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 34a3fdb..20931ac 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -38,4 +38,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 439c006..da6677b 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -83,4 +83,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 808eb26..c38821b 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,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-record-utils</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     <artifactId>nifi-hadoop-record-utils</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.0</version>
     <packaging>jar</packaging>
     <dependencyManagement>
         <dependencies>
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hadoop-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-avro-record-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <!-- Other modules using nifi-hadoop-utils are expected to have the below dependencies available, typically through a NAR dependency -->
         <dependency>
@@ -94,4 +94,8 @@
         </dependency>
     </dependencies>
 
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 35b9c4b..d2b6a79 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     
     <artifactId>nifi-mock-record-utils</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</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.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -95,4 +95,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>nifi-1.16.0-RC2</tag>
+  </scm>
 </project>
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 3f44b92..2492148 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.16.0-SNAPSHOT</version>
+        <version>1.16.0</version>
     </parent>
     
     <artifactId>nifi-standard-record-utils</artifactId>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-utils</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-security-socket-ssl</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
         </dependency>
         <!-- Other modules using nifi-standard-record-utils are expected to have these APIs available, typically through a NAR dependency -->
         <dependency>
@@ -64,8 +64,12 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.16.0</version>
 	    <scope>test</scope>
         </dependency>
     </dependencies>
+
... 16238 lines suppressed ...