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 2015/07/18 07:43:37 UTC

[3/3] nifi git commit: NIFI-768 changed all versions and docs and paths to TLP version removing incubator refs

NIFI-768 changed all versions and docs and paths to TLP version removing incubator refs

NIFI-768 changed all versions and docs and paths to TLP version removing incubator refs


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/dae1b965
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dae1b965
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dae1b965

Branch: refs/heads/develop
Commit: dae1b9656f36fee6c5381b9bbe8d88556bb3021e
Parents: f76aeb2
Author: joewitt <jo...@apache.org>
Authored: Thu Jul 16 12:35:37 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Sat Jul 18 01:13:40 2015 -0400

----------------------------------------------------------------------
 README.md                                       | 28 ++----
 nifi-nar-maven-plugin/pom.xml                   |  6 +-
 nifi-parent/pom.xml                             | 39 ++++----
 nifi/DISCLAIMER                                 | 15 ----
 nifi/README.md                                  | 32 ++-----
 nifi/nifi-api/pom.xml                           |  2 +-
 nifi/nifi-assembly/README.md                    | 20 +----
 nifi/nifi-assembly/pom.xml                      | 23 +++--
 .../src/main/assembly/dependencies.xml          |  7 --
 nifi/nifi-bootstrap/pom.xml                     |  2 +-
 .../nifi-data-provenance-utils/pom.xml          |  2 +-
 .../nifi-expression-language/pom.xml            |  2 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  2 +-
 .../nifi-hl7-query-language/pom.xml             |  2 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml    |  2 +-
 .../nifi-processor-utilities/pom.xml            |  2 +-
 nifi/nifi-commons/nifi-properties/pom.xml       |  2 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  2 +-
 .../nifi-site-to-site-client/pom.xml            |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml     |  2 +-
 nifi/nifi-commons/nifi-utils/pom.xml            |  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml        |  2 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  2 +-
 nifi/nifi-commons/pom.xml                       |  2 +-
 nifi/nifi-docs/pom.xml                          |  2 +-
 .../src/main/asciidoc/administration-guide.adoc |  4 +-
 .../src/main/asciidoc/developer-guide.adoc      |  8 +-
 .../asciidoc/expression-language-guide.adoc     | 12 +--
 nifi/nifi-docs/src/main/asciidoc/overview.adoc  |  4 +-
 .../nifi-docs/src/main/asciidoc/user-guide.adoc |  6 +-
 .../nifi-nifi-example-nar/pom.xml               |  2 +-
 .../nifi-nifi-example-processors/pom.xml        |  2 +-
 nifi/nifi-external/nifi-example-bundle/pom.xml  |  4 +-
 nifi/nifi-external/nifi-spark-receiver/pom.xml  |  2 +-
 nifi/nifi-external/nifi-storm-spout/pom.xml     |  2 +-
 nifi/nifi-external/pom.xml                      |  2 +-
 .../nifi-processor-bundle-archetype/pom.xml     |  2 +-
 .../META-INF/maven/archetype-metadata.xml       |  4 +-
 nifi/nifi-maven-archetypes/pom.xml              |  2 +-
 nifi/nifi-mock/pom.xml                          |  2 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml        |  4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |  2 +-
 nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml   |  2 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml    |  4 +-
 .../nifi-flume-processors/pom.xml               |  2 +-
 nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml |  6 +-
 .../nifi-framework-nar/pom.xml                  |  2 +-
 .../nifi-framework/nifi-administration/pom.xml  |  2 +-
 .../nifi-framework/nifi-client-dto/pom.xml      |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |  2 +-
 .../nifi-file-authorization-provider/pom.xml    |  2 +-
 .../nifi-framework-cluster-protocol/pom.xml     |  2 +-
 .../nifi-framework-cluster-web/pom.xml          |  2 +-
 .../nifi-framework-cluster/pom.xml              |  2 +-
 .../nifi-framework-core-api/pom.xml             |  2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml       |  2 +-
 .../nifi-framework/nifi-resources/pom.xml       |  2 +-
 .../nifi-framework/nifi-runtime/pom.xml         |  2 +-
 .../nifi-framework/nifi-security/pom.xml        |  2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml    |  2 +-
 .../src/test/resources/nifi.properties          |  2 +-
 .../nifi-framework/nifi-user-actions/pom.xml    |  2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-ui-extension/pom.xml          |  2 +-
 .../nifi-web/nifi-web-api/pom.xml               |  6 +-
 .../resources/access-control/nifi.properties    |  2 +-
 .../nifi-web/nifi-web-content-access/pom.xml    |  2 +-
 .../nifi-web/nifi-web-content-viewer/pom.xml    |  2 +-
 .../nifi-web/nifi-web-docs/pom.xml              |  2 +-
 .../nifi-web/nifi-web-error/pom.xml             |  2 +-
 .../nifi-web-optimistic-locking/pom.xml         |  2 +-
 .../nifi-web/nifi-web-security/pom.xml          |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../WEB-INF/partials/canvas/about-dialog.jsp    |  4 +-
 .../nifi-framework/nifi-web/pom.xml             | 12 +--
 .../nifi-framework/pom.xml                      |  2 +-
 .../nifi-framework-bundle/pom.xml               | 38 ++++----
 .../nifi-geo-bundle/nifi-geo-nar/pom.xml        |  2 +-
 .../nifi-geo-bundle/nifi-geo-processors/pom.xml |  2 +-
 nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml   |  4 +-
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  2 +-
 .../nifi-hdfs-processors/pom.xml                |  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  4 +-
 .../nifi-hadoop-libraries-nar/pom.xml           |  2 +-
 .../nifi-hadoop-libraries-bundle/pom.xml        |  2 +-
 .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml        |  4 +-
 .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml |  4 +-
 nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml   |  2 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  2 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml    |  2 +-
 .../nifi-kafka-processors/pom.xml               |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../nifi-kite-bundle/nifi-kite-nar/pom.xml      |  2 +-
 .../nifi-kite-processors/pom.xml                |  2 +-
 nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml  |  4 +-
 .../nifi-language-translation-nar/pom.xml       |  4 +-
 .../nifi-yandex-processors/pom.xml              |  2 +-
 .../nifi-language-translation-bundle/pom.xml    |  2 +-
 .../nifi-mongodb-nar/pom.xml                    |  6 +-
 .../nifi-mongodb-processors/pom.xml             |  2 +-
 .../nifi-mongodb-bundle/pom.xml                 |  4 +-
 .../pom.xml                                     |  2 +-
 .../nifi-provenance-repository-nar/pom.xml      |  2 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  6 +-
 .../nifi-social-media-nar/pom.xml               |  4 +-
 .../nifi-twitter-processors/pom.xml             |  2 +-
 .../nifi-social-media-bundle/pom.xml            |  2 +-
 .../nifi-solr-bundle/nifi-solr-nar/pom.xml      |  4 +-
 .../nifi-solr-processors/pom.xml                |  2 +-
 nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml  |  2 +-
 .../nifi-standard-content-viewer/pom.xml        |  2 +-
 .../nifi-standard-nar/pom.xml                   |  2 +-
 .../nifi-standard-prioritizers/pom.xml          |  2 +-
 .../nifi-standard-processors/pom.xml            |  2 +-
 .../nifi-standard-reporting-tasks/pom.xml       |  2 +-
 .../nifi-standard-bundle/pom.xml                | 10 +--
 .../nifi-dbcp-service-api/pom.xml               |  2 +-
 .../nifi-dbcp-service-nar/pom.xml               |  4 +-
 .../nifi-dbcp-service/pom.xml                   |  4 +-
 .../nifi-dbcp-service-bundle/pom.xml            |  2 +-
 .../pom.xml                                     |  2 +-
 .../pom.xml                                     |  2 +-
 .../nifi-distributed-cache-protocol/pom.xml     |  2 +-
 .../nifi-distributed-cache-server/pom.xml       |  2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |  2 +-
 .../pom.xml                                     |  2 +-
 .../nifi-http-context-map-api/pom.xml           |  2 +-
 .../nifi-http-context-map-nar/pom.xml           |  2 +-
 .../nifi-http-context-map/pom.xml               |  2 +-
 .../nifi-http-context-map-bundle/pom.xml        |  2 +-
 .../nifi-load-distribution-service-api/pom.xml  |  2 +-
 .../nifi-ssl-context-nar/pom.xml                |  2 +-
 .../nifi-ssl-context-service/pom.xml            |  2 +-
 .../nifi-ssl-context-bundle/pom.xml             |  2 +-
 .../nifi-ssl-context-service-api/pom.xml        |  2 +-
 .../nifi-standard-services-api-nar/pom.xml      |  4 +-
 .../nifi-standard-services/pom.xml              |  2 +-
 .../nifi-update-attribute-model/pom.xml         |  2 +-
 .../nifi-update-attribute-nar/pom.xml           |  2 +-
 .../nifi-update-attribute-processor/pom.xml     |  2 +-
 .../nifi-update-attribute-ui/pom.xml            |  2 +-
 .../nifi-update-attribute-bundle/pom.xml        |  8 +-
 nifi/nifi-nar-bundles/pom.xml                   | 30 +++----
 nifi/pom.xml                                    | 94 ++++++++++----------
 148 files changed, 325 insertions(+), 385 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8a4fdba..c71bb0f 100644
--- a/README.md
+++ b/README.md
@@ -20,15 +20,14 @@ Apache NiFi is an easy to use, powerful, and reliable system to process and dist
 
 - [Getting Started](#getting-started)
 - [License](#license)
-- [Disclaimer](#disclaimer)
 
 ## Getting Started
 
-- Read through the [quickstart guide for development](http://nifi.incubator.apache.org/quickstart.html).
+- Read through the [quickstart guide for development](http://nifi.apache.org/quickstart.html).
   It will include information on getting a local copy of the source, give pointers on issue
   tracking, and provide some warnings about common problems with development environments.
 - For a more comprehensive guide to development and information about contributing to the project
-  read through the [NiFi Developer's Guide](http://nifi.incubator.apache.org/developer-guide.html).
+  read through the [NiFi Developer's Guide](http://nifi.apache.org/developer-guide.html).
 - Optional: Build supporting modules. This should only be needed if the current 'nifi' module is in
   the process of updating to a new version of either the 'nifi-parent' or 'nifi-nar-maven-plugin'
   artifacts.
@@ -44,7 +43,7 @@ Apache NiFi is an easy to use, powerful, and reliable system to process and dist
     you'll see an erorr like the following:
 
         [ERROR]     Non-resolvable parent POM: Could not find artifact
-            org.apache.nifi:nifi-parent:pom:1.0.0-incubating-SNAPSHOT in example.snapshots.repo
+            org.apache.nifi:nifi-parent:pom:1.0.0-SNAPSHOT in example.snapshots.repo
             (https://repository.example.com/content/repositories/snapshots) and
             'parent.relativePath' points at no local POM @ line 18, column 13 -> [Help 2]
     - Build the nifi-nar-maven-plugin.  Change directory to 'nifi-nar-maven-plugin' and
@@ -54,18 +53,18 @@ Apache NiFi is an easy to use, powerful, and reliable system to process and dist
     version you'll see an error like the following:
 
         [ERROR]     Unresolveable build extension: Plugin
-            org.apache.nifi:nifi-nar-maven-plugin:1.0.1-incubating-SNAPSHOT or one of its
+            org.apache.nifi:nifi-nar-maven-plugin:1.0.1-SNAPSHOT or one of its
             dependencies could not be resolved: Could not find artifact
-            org.apache.nifi:nifi-nar-maven-plugin:jar:1.0.1-incubating-SNAPSHOT -> [Help 2]
+            org.apache.nifi:nifi-nar-maven-plugin:jar:1.0.1-SNAPSHOT -> [Help 2]
 - Build nifi.  Change directory to 'nifi' and follow the directions found there in
   [README.md](nifi/README.md).
 - Run NiFi. The directions found in the [README.md](nifi/README.md) file within the 'nifi' module
   will also include how to run an instance of NiFi. For help on how to build your first data flow,
-  see the [NiFi User Guide](http://nifi.incubator.apache.org/docs/nifi-docs/user-guide.html).
+  see the [NiFi User Guide](http://nifi.apache.org/docs/nifi-docs/user-guide.html).
 
 ## Documentation
 
-See http://nifi.incubator.apache.org/ for the latest documentation.
+See http://nifi.apache.org/ for the latest documentation.
 
 ## License
 
@@ -84,16 +83,3 @@ 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.
 
-## Disclaimer
-
-Apache NiFi is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
-

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi-nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index f6e104c..4e08f2e 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -18,13 +18,13 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-parent</artifactId>
-        <version>1.0.0-incubating</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath />
     </parent>
     <artifactId>nifi-nar-maven-plugin</artifactId>
-    <version>1.0.2-incubating-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
-    <description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
+    <description>Apache NiFi Nar Plugin.</description>
     <build>
         <pluginManagement>
             <plugins>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi-parent/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml
index 9ccb6ec..0370c97 100644
--- a/nifi-parent/pom.xml
+++ b/nifi-parent/pom.xml
@@ -18,18 +18,18 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>16</version>
+        <version>17</version>
         <relativePath />
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-parent</artifactId>
-    <version>1.0.1-incubating-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>The nifi-parent enables each apache nifi project to ensure consistent approaches and DRY</description>
-    <url>http://nifi.incubator.apache.org</url>
+    <url>http://nifi.apache.org</url>
     <organization>
-        <name>Apache NiFi(incubating) Project</name>
-        <url>http://nifi.incubator.apache.org/</url>
+        <name>Apache NiFi Project</name>
+        <url>http://nifi.apache.org/</url>
     </organization>
     <licenses>
         <license>
@@ -40,26 +40,33 @@
     <mailingLists>
         <mailingList>
             <name>Dev</name>
-            <subscribe>dev-subscribe@nifi.incubator.apache.org</subscribe>
-            <unsubscribe>dev-unsubscribe@nifi.incubator.apache.org</unsubscribe>
-            <post>dev@nifi.incubator.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev</archive>
+            <subscribe>dev-subscribe@nifi.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@nifi.apache.org</unsubscribe>
+            <post>dev@nifi.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/nifi-dev</archive>
+        </mailingList>
+        <mailingList>
+            <name>Users</name>
+            <subscribe>users-subscribe@nifi.apache.org</subscribe>
+            <unsubscribe>users-unsubscribe@nifi.apache.org</unsubscribe>
+            <post>users@nifi.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/nifi-users</archive>
         </mailingList>
         <mailingList>
             <name>Commits</name>
-            <subscribe>commits-subscribe@nifi.incubator.apache.org</subscribe>
-            <unsubscribe>commits-unsubscribe@nifi.incubator.apache.org</unsubscribe>
-            <post>commits@nifi.incubator.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits</archive>
+            <subscribe>commits-subscribe@nifi.apache.org</subscribe>
+            <unsubscribe>commits-unsubscribe@nifi.apache.org</unsubscribe>
+            <post>commits@nifi.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/nifi-commits</archive>
         </mailingList>
     </mailingLists>
     <prerequisites>
         <maven>${maven.min-version}</maven>
     </prerequisites>
     <scm>
-        <connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
+        <connection>scm:git:git://git.apache.org/nifi.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=nifi.git</url>
         <tag>HEAD</tag>
     </scm>
     <issueManagement>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/DISCLAIMER
----------------------------------------------------------------------
diff --git a/nifi/DISCLAIMER b/nifi/DISCLAIMER
deleted file mode 100644
index 0f8e7a1..0000000
--- a/nifi/DISCLAIMER
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache NiFi is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
-
-For more information about the incubation status of the Apache NiFi project
-you can go to the following page:
-
-http://nifi.incubator.apache.org/

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/README.md
----------------------------------------------------------------------
diff --git a/nifi/README.md b/nifi/README.md
index cffa09a..a680f78 100644
--- a/nifi/README.md
+++ b/nifi/README.md
@@ -23,7 +23,6 @@ Apache NiFi is an easy to use, powerful, and reliable system to process and dist
 - [Getting Started](#getting-started)
 - [Getting Help](#getting-help)
 - [License](#license)
-- [Disclaimer](#disclaimer)
 - [Export Control] (#export-control)
 
 ## Features
@@ -75,9 +74,9 @@ To deploy:
 
         laptop:nifi fhampton$ cd nifi-assembly
         laptop:nifi-assembly fhampton$ ls -lhd target/nifi*
-        drwxr-xr-x  3 fhampton  staff   102B Apr 30 00:29 target/nifi-0.1.0-incubating-SNAPSHOT-bin
-        -rw-r--r--  1 fhampton  staff   144M Apr 30 00:30 target/nifi-0.1.0-incubating-SNAPSHOT-bin.tar.gz
-        -rw-r--r--  1 fhampton  staff   144M Apr 30 00:30 target/nifi-0.1.0-incubating-SNAPSHOT-bin.zip
+        drwxr-xr-x  3 fhampton  staff   102B Apr 30 00:29 target/nifi-0.1.0-SNAPSHOT-bin
+        -rw-r--r--  1 fhampton  staff   144M Apr 30 00:30 target/nifi-0.1.0-SNAPSHOT-bin.tar.gz
+        -rw-r--r--  1 fhampton  staff   144M Apr 30 00:30 target/nifi-0.1.0-SNAPSHOT-bin.zip
 
 - For testing ongoing development you could use the already unpacked build present in the directory
   named "nifi-*version*-bin", where *version* is the current project version. To deploy in another
@@ -88,27 +87,27 @@ To deploy:
         laptop:nifi-assembly fhampton$ tar xzf target/nifi-*-bin.tar.gz -C ~/example-nifi-deploy
         laptop:nifi-assembly fhampton$ ls -lh ~/example-nifi-deploy/
         total 0
-        drwxr-xr-x  10 fhampton  staff   340B Apr 30 01:06 nifi-0.1.0-incubating-SNAPSHOT
+        drwxr-xr-x  10 fhampton  staff   340B Apr 30 01:06 nifi-0.1.0-SNAPSHOT
 
 To run NiFi:
 - Change directory to the location where you installed NiFi and run it.
 
         laptop:~ fhampton$ cd ~/example-nifi-deploy/nifi-*
-        laptop:nifi-0.1.0-incubating-SNAPSHOT fhampton$ ./bin/nifi.sh start
+        laptop:nifi-0.1.0-SNAPSHOT fhampton$ ./bin/nifi.sh start
 
 - Direct your browser to http://localhost:8080/nifi/ and you should see a screen like this screenshot:
   ![image of a NiFi dataflow canvas](nifi-docs/src/main/asciidoc/images/nifi_first_launch_screenshot.png?raw=true)
 
-- For help building your first data flow see the [NiFi User Guide](http://nifi.incubator.apache.org/docs/nifi-docs/user-guide.html)
+- For help building your first data flow see the [NiFi User Guide](http://nifi.apache.org/docs/nifi-docs/user-guide.html)
 
 - If you are testing ongoing development, you will likely want to stop your instance.
 
         laptop:~ fhampton$ cd ~/example-nifi-deploy/nifi-*
-        laptop:nifi-0.1.0-incubating-SNAPSHOT fhampton$ ./bin/nifi.sh stop
+        laptop:nifi-0.1.0-SNAPSHOT fhampton$ ./bin/nifi.sh stop
 
 ## Getting Help
-If you have questions, you can reach out to our mailing list: dev@nifi.incubator.apache.org
-([archive](http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev)).
+If you have questions, you can reach out to our mailing list: dev@nifi.apache.org
+([archive](http://mail-archives.apache.org/mod_mbox/nifi-dev)).
 We're also often available in IRC: #nifi on
 [irc.freenode.net](http://webchat.freenode.net/?channels=#nifi).
 
@@ -129,19 +128,6 @@ 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.
 
-## Disclaimer
-
-Apache NiFi is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
-
 ## Export Control
 
 This distribution includes cryptographic software. The country in which you 

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
index d8cb3fa..5ea116e 100644
--- a/nifi/nifi-api/pom.xml
+++ b/nifi/nifi-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-api</artifactId>
     <packaging>jar</packaging>    

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-assembly/README.md
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/README.md b/nifi/nifi-assembly/README.md
index 106505d..4fb4d3b 100644
--- a/nifi/nifi-assembly/README.md
+++ b/nifi/nifi-assembly/README.md
@@ -14,7 +14,7 @@
 -->
 # Apache NiFi
 
-Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. It is currently apart of the Apache Incubator.
+Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data.
 
 ## Table of Contents
 
@@ -23,7 +23,6 @@ Apache NiFi is an easy to use, powerful, and reliable system to process and dist
 - [Getting Help](#getting-help)
 - [Requirements](#requirements)
 - [License](#license)
-- [Disclaimer](#disclaimer)
 - [Export Control] (#export-control)
 
 ## Features
@@ -55,8 +54,8 @@ To start NiFi:
 - Direct your browser to http://localhost:8080/nifi/
 
 ## Getting Help
-If you have questions, you can reach out to our mailing list: dev@nifi.incubator.apache.org
-([archive](http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev)).
+If you have questions, you can reach out to our mailing list: dev@nifi.apache.org
+([archive](http://mail-archives.apache.org/mod_mbox/nifi-dev)).
 We're also often available in IRC: #nifi on
 [irc.freenode.net](http://webchat.freenode.net/?channels=#nifi).
 
@@ -80,19 +79,6 @@ 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.
 
-## Disclaimer
-
-Apache NiFi is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
-
 ## Export Control
 
 This distribution includes cryptographic software. The country in which you 

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index 473b947..8677c60 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -14,11 +14,11 @@ language governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-assembly</artifactId>
     <packaging>pom</packaging>
-    <description>This is the assembly Apache NiFi (incubating)</description>
+    <description>This is the assembly Apache NiFi</description>
     <build>
         <plugins>
             <plugin>
@@ -175,7 +175,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-dbcp-service-nar</artifactId>
-	        <version>0.2.1-incubating-SNAPSHOT</version>
+	        <version>0.2.1-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -191,25 +191,25 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-social-media-nar</artifactId>
-            <version>0.2.1-incubating-SNAPSHOT</version>
+            <version>0.2.1-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hl7-nar</artifactId>
-            <version>0.2.1-incubating-SNAPSHOT</version>
+            <version>0.2.1-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-language-translation-nar</artifactId>
-            <version>0.2.1-incubating-SNAPSHOT</version>
+            <version>0.2.1-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-geo-nar</artifactId>
-            <version>0.2.1-incubating-SNAPSHOT</version>
+            <version>0.2.1-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
     </dependencies>
@@ -398,10 +398,10 @@ language governing permissions and limitations under the License. -->
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>rpm-maven-plugin</artifactId>
                         <configuration>
-                            <summary>Apache NiFi (incubating)</summary>
-                            <description>Apache Nifi (incubating) is dataflow system based on the Flow-Based Programming concepts.</description>
+                            <summary>Apache NiFi</summary>
+                            <description>Apache NiFi is dataflow system based on the Flow-Based Programming concepts.</description>
                             <license>Apache License, Version 2.0 and others (see included LICENSE file)</license>
-                            <url>http://nifi.incubator.apache.org</url>
+                            <url>http://nifi.apache.org</url>
                             <group>Utilities</group>
                             <prefix>/opt/nifi</prefix>
                             <defineStatements>
@@ -437,9 +437,6 @@ language governing permissions and limitations under the License. -->
                                                     <location>./NOTICE</location>
                                                 </source>
                                                 <source>
-                                                    <location>../DISCLAIMER</location>
-                                                </source>
-                                                <source>
                                                     <location>./README.md</location>
                                                     <destination>README</destination>
                                                 </source>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-assembly/src/main/assembly/dependencies.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/src/main/assembly/dependencies.xml b/nifi/nifi-assembly/src/main/assembly/dependencies.xml
index 243d0ac..0e5362c 100644
--- a/nifi/nifi-assembly/src/main/assembly/dependencies.xml
+++ b/nifi/nifi-assembly/src/main/assembly/dependencies.xml
@@ -123,13 +123,6 @@
             <filtered>true</filtered>
         </file>
         <file>
-            <source>../DISCLAIMER</source>
-            <outputDirectory>./</outputDirectory>
-            <destName>DISCLAIMER</destName>
-            <fileMode>0644</fileMode>
-            <filtered>true</filtered>
-        </file>
-        <file>
             <source>./LICENSE</source>
             <outputDirectory>./</outputDirectory>
             <destName>LICENSE</destName>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-bootstrap/pom.xml b/nifi/nifi-bootstrap/pom.xml
index ad84fd7..1751b45 100644
--- a/nifi/nifi-bootstrap/pom.xml
+++ b/nifi/nifi-bootstrap/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-bootstrap</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
index 3d90401..c52064c 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-data-provenance-utils</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-expression-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-expression-language/pom.xml b/nifi/nifi-commons/nifi-expression-language/pom.xml
index d36e462..fb26471 100644
--- a/nifi/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi/nifi-commons/nifi-expression-language/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-expression-language</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
index 8eaea1e..6ff3c12 100644
--- a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flowfile-packager</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
index e0dd314..d12f8ea 100644
--- a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 	
     <artifactId>nifi-hl7-query-language</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-logging-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-logging-utils/pom.xml b/nifi/nifi-commons/nifi-logging-utils/pom.xml
index 1bb37b0..c0d4a83 100644
--- a/nifi/nifi-commons/nifi-logging-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-logging-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-logging-utils</artifactId>
     <description>Utilities for logging</description>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-processor-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-processor-utilities/pom.xml b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
index cc8718c..3eaeef4 100644
--- a/nifi/nifi-commons/nifi-processor-utilities/pom.xml
+++ b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-processor-utils</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-properties/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-properties/pom.xml b/nifi/nifi-commons/nifi-properties/pom.xml
index 9432b70..574690f 100644
--- a/nifi/nifi-commons/nifi-properties/pom.xml
+++ b/nifi/nifi-commons/nifi-properties/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-properties</artifactId>
 </project>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-security-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-security-utils/pom.xml b/nifi/nifi-commons/nifi-security-utils/pom.xml
index 3772fab..2ad4a0b 100644
--- a/nifi/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-security-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security-utils</artifactId>
     <description>Contains security functionality.</description>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
index 43d5450..43ca926 100644
--- a/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
+++ b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-site-to-site-client</artifactId>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-client-dto</artifactId>
-            <version>0.2.1-incubating-SNAPSHOT</version>
+            <version>0.2.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-socket-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/pom.xml b/nifi/nifi-commons/nifi-socket-utils/pom.xml
index 80ca860..24b8bc7 100644
--- a/nifi/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-socket-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-socket-utils</artifactId>
     <description>Utilities for socket communication</description>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-utils/pom.xml b/nifi/nifi-commons/nifi-utils/pom.xml
index 7a1bf01..de698dc 100644
--- a/nifi/nifi-commons/nifi-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-utils/pom.xml
@@ -18,10 +18,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-utils</artifactId>
-    <version>0.2.1-incubating-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <!--
     This project intentionally has no additional dependencies beyond that pulled in by the parent.  It is a general purpose utility library

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-web-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-web-utils/pom.xml b/nifi/nifi-commons/nifi-web-utils/pom.xml
index aed227c..7264e4c 100644
--- a/nifi/nifi-commons/nifi-web-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-web-utils/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-web-utils</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
index b6f4b52..124664a 100644
--- a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
+++ b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-commons</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-write-ahead-log</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-commons/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/pom.xml b/nifi/nifi-commons/pom.xml
index c523c67..c2be0e3 100644
--- a/nifi/nifi-commons/pom.xml
+++ b/nifi/nifi-commons/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-commons</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml
index 41e3ee8..7699f2a 100644
--- a/nifi/nifi-docs/pom.xml
+++ b/nifi/nifi-docs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>nifi-docs</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 5535c35..4595c75 100644
--- a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -16,8 +16,8 @@
 //
 NiFi System Administrator's Guide
 =================================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
 
 System Requirements
 -------------------

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
index b372562..bce4917 100644
--- a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
@@ -16,13 +16,13 @@
 //
 NiFi Developer's Guide
 ======================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
 
 
 == Introduction
 
-The intent of this Developer Guide is to provide the reader with the information needed to understand how Apache NiFi (incubating)
+The intent of this Developer Guide is to provide the reader with the information needed to understand how Apache NiFi
 extensions are developed and help to explain the thought process behind developing the components. It provides an introduction to
 and explanation of the API that is used to develop extensions. It does not, however, go into great detail about each
 of the methods in the API, as this guide is intended to supplement the JavaDocs of the API rather than replace them.
@@ -2163,7 +2163,7 @@ and attaching that patch to a ticket, or by generating a Pull Request.
 
 === Contact Us
 
-The developer mailing list (dev@nifi.incubator.apache.org) is monitored pretty closely, and we tend to respond pretty
+The developer mailing list (dev@nifi.apache.org) is monitored pretty closely, and we tend to respond pretty
 quickly. If you have a question, don't hesitate to shoot us an e-mail - we're here to help! Unfortunately, though, e-mails
 can get lost in the shuffle, so if you do send an e-mail and don't get a response within a day or two, it's our fault - don't
 worry about bothering us. Just ping the mailing list again.

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index d8ccdb4..af0ee02 100644
--- a/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -16,8 +16,8 @@
 //
 Apache NiFi Expression Language Guide
 =====================================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
 
 [[overview]]
 Overview
@@ -543,8 +543,8 @@ Each of the following functions manipulates a String in some way.
 *Return Type*: [.returnType]#String#
 
 *Examples*: We can URL-Encode an attribute named "url" by using the Expression `${url:urlEncode()}`. If
-	the value of the "url" attribute is "https://nifi.incubator.apache.org/some value with spaces", this
-	Expression will then return "https://nifi.incubator.apache.org/some%20value%20with%20spaces".
+	the value of the "url" attribute is "https://nifi.apache.org/some value with spaces", this
+	Expression will then return "https://nifi.apache.org/some%20value%20with%20spaces".
 
 
 
@@ -561,8 +561,8 @@ Each of the following functions manipulates a String in some way.
 *Return Type*: [.returnType]#String#
 
 *Examples*: If we have a URL-Encoded attribute named "url" with the value 
-	"https://nifi.incubator.apache.org/some%20value%20with%20spaces", then the Expression
-	`${url:urlDecode()}` will return "https://nifi.incubator.apache.org/some value with spaces".
+	"https://nifi.apache.org/some%20value%20with%20spaces", then the Expression
+	`${url:urlDecode()}` will return "https://nifi.apache.org/some value with spaces".
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-docs/src/main/asciidoc/overview.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/overview.adoc b/nifi/nifi-docs/src/main/asciidoc/overview.adoc
index 2e62649..af5a907 100644
--- a/nifi/nifi-docs/src/main/asciidoc/overview.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/overview.adoc
@@ -16,8 +16,8 @@
 //
 Apache NiFi Overview
 ====================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
 
 What is Apache NiFi?
 --------------------

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
index 7386b72..e718bce 100644
--- a/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -16,13 +16,13 @@
 //
 Apache NiFi User Guide
 ======================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
 
 
 Introduction
 ------------
-Apache NiFi (Incubating) is a dataflow system based on the concepts of flow-based programming. It supports
+Apache NiFi is a dataflow system based on the concepts of flow-based programming. It supports
 powerful and scalable directed graphs of data routing, transformation, and system mediation logic. NiFi has
 a web-based user interface for design, control, feedback, and monitoring of dataflows. It is highly configurable
 along several dimensions of quality of service, such as loss-tolerant versus guaranteed delivery, low latency versus

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml b/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
index ceed598..965608f 100644
--- a/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
+++ b/nifi/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>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-example-nar</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml b/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
index 730e7ac..369ff6e 100644
--- a/nifi/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
+++ b/nifi/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>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-nifi-example-processors</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-external/nifi-example-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-example-bundle/pom.xml b/nifi/nifi-external/nifi-example-bundle/pom.xml
index b5d1d08..e5f4c1f 100644
--- a/nifi/nifi-external/nifi-example-bundle/pom.xml
+++ b/nifi/nifi-external/nifi-example-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-external</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-example-bundle</artifactId>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nifi-example-processors</artifactId>
-                <version>0.2.1-incubating-SNAPSHOT</version>
+                <version>0.2.1-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-external/nifi-spark-receiver/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-spark-receiver/pom.xml b/nifi/nifi-external/nifi-spark-receiver/pom.xml
index 90a0600..c3ecdfe 100644
--- a/nifi/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi/nifi-external/nifi-spark-receiver/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-external</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-spark-receiver</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-external/nifi-storm-spout/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-storm-spout/pom.xml b/nifi/nifi-external/nifi-storm-spout/pom.xml
index 899417d..9ec7495 100644
--- a/nifi/nifi-external/nifi-storm-spout/pom.xml
+++ b/nifi/nifi-external/nifi-storm-spout/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-external</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-storm-spout</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-external/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/pom.xml b/nifi/nifi-external/pom.xml
index 06ce36d..7d967fc 100644
--- a/nifi/nifi-external/pom.xml
+++ b/nifi/nifi-external/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-external</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index 49808af..aa8a118 100644
--- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi/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>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-processor-bundle-archetype</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 979916c..3dc2ba8 100644
--- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,7 +17,7 @@
   <requiredProperties>
     <requiredProperty key="artifactBaseName" />
     <requiredProperty key="nifiVersion" >
-        <defaultValue>0.1.0-incubating-SNAPSHOT</defaultValue>
+        <defaultValue>0.2.1-SNAPSHOT</defaultValue>
     </requiredProperty>
 	<requiredProperty key="package">
 		<defaultValue>${groupId}.processors.${artifactBaseName}</defaultValue>
@@ -40,4 +40,4 @@
         <directory>nifi-__artifactBaseName__-nar</directory>
     </fileSet>
   </fileSets>
-</archetype-descriptor>
\ No newline at end of file
+</archetype-descriptor>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/pom.xml b/nifi/nifi-maven-archetypes/pom.xml
index 2ab42c8..8e86482 100644
--- a/nifi/nifi-maven-archetypes/pom.xml
+++ b/nifi/nifi-maven-archetypes/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-maven-archetypes</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-mock/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/pom.xml b/nifi/nifi-mock/pom.xml
index ebbffc6..44923ee 100644
--- a/nifi/nifi-mock/pom.xml
+++ b/nifi/nifi-mock/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-mock</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
index 14b2160..77f4be3 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
+++ b/nifi/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>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-nar</artifactId>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-aws-processors</artifactId>
-            <version>0.2.1-incubating-SNAPSHOT</version>
+            <version>0.2.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
index e48f287..a931ccf 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-aws-bundle</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-processors</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 16a64d6..1db5990 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nifi-aws-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
index 8d615a8..9c25651 100644
--- a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
@@ -17,10 +17,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-flume-bundle</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flume-nar</artifactId>
-    <version>0.2.1-incubating-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>nar</packaging>
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
index fcf42ee..fbbe8ba 100644
--- a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-flume-bundle</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flume-processors</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml
index d5ad112..434329c 100644
--- a/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml
@@ -17,10 +17,10 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-nar-bundles</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-flume-bundle</artifactId>
-    <version>0.2.1-incubating-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>A bundle of processors that run Flume sources/sinks</description>
     <modules>
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-flume-processors</artifactId>
-                <version>0.2.1-incubating-SNAPSHOT</version>
+                <version>0.2.1-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
index 9d89488..e42f27b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework-bundle</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-nar</artifactId>
     <packaging>nar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
index c919e4d..738459a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-administration</artifactId>
     <build>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
index 789a11f..10c50e6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-client-dto</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
index 31f1fb0..bebe426 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-cluster-authorization-provider</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
index 0e2dc13..bf7fb47 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-documentation</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
index 7f2a6b4..b6ca177 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-file-authorization-provider</artifactId>
     <build>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
index 37042ce..3029291 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-cluster-protocol</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
index 31c96c9..1817408 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-cluster-web</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
index 9ae1a9b..fdf2ff2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-cluster</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index 5f9cca1..cd6714a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-core-api</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index fbb22b3..b22b8c7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-core</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
index 58857d8..ddcf4e0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-nar-utils</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index 2ba22c7..15bc309 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-resources</artifactId>
     <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
index 2235718..493851d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-runtime</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
index b83a48a..37d04a2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-security</artifactId>
     <description>Contains security functionality common to NiFi.</description>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index d46c4af..022f23b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-site-to-site</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
index 5d9e47e..4364bff 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
@@ -25,7 +25,7 @@ nifi.flowfile.repository.checkpoint.millis=120000
 nifi.content.repository.directory.default=./content_repository
 nifi.provenance.repository.capacity=25000
 nifi.templates.directory=./conf/templates
-nifi.version=nifi 0.0.1-incubating-SNAPSHOT
+nifi.version=nifi 0.2.1-SNAPSHOT
 nifi.ui.banner.text=DEFAULT BANNER
 nifi.ui.autorefresh.interval.seconds=30
 nifi.flowcontroller.autoStartProcessors=true

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index b1988bc..0a08a99 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-framework</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-user-actions</artifactId>
 </project>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
index 3e36d27..0b31db3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-web</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-custom-ui-utilities</artifactId>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 9284269..46b6ecd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-web</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-jetty</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
index fb7d1e6..e0fe177 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-web</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-ui-extension</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 0e6eeb6..0b9ce56 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-web</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-web-api</artifactId>
@@ -65,8 +65,8 @@
                                             to invoke each service.
                                         </description>
                                         <contact>
-                                            <email>dev@nifi.incubator.apache.org</email>
-                                            <url>https://nifi.incubator.apache.org</url>
+                                            <email>dev@nifi.apache.org</email>
+                                            <url>https://nifi.apache.org</url>
                                         </contact>
                                         <license>
                                             <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
index 3ea2a23..3393605 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Core Properties #
-nifi.version=nifi 0.0.1-incubating-SNAPSHOT 
+nifi.version=nifi 0.2.1-SNAPSHOT 
 nifi.flow.configuration.file=
 nifi.flow.configuration.archive.dir=target/archive
 nifi.flowcontroller.autoResumeState=true

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index 2acf514..e80cf6f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-web</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-web-content-access</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/dae1b965/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index a251985..077d07f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi</groupId>
         <artifactId>nifi-web</artifactId>
-        <version>0.2.1-incubating-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-web-content-viewer</artifactId>