diff --git a/README.md b/README.md
index 8a4fdba757..c71bb0fa82 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.
-
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index f6e104c311..4e08f2ec00 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -18,13 +18,13 @@
org.apache.nifinifi-parent
- 1.0.0-incubating
+ 1.0.1-SNAPSHOTnifi-nar-maven-plugin
- 1.0.2-incubating-SNAPSHOT
+ 1.0.2-SNAPSHOTmaven-plugin
- Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.
+ Apache NiFi Nar Plugin.
diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml
index 9ccb6ec2bf..0370c97696 100644
--- a/nifi-parent/pom.xml
+++ b/nifi-parent/pom.xml
@@ -18,18 +18,18 @@
org.apacheapache
- 16
+ 17org.apache.nifinifi-parent
- 1.0.1-incubating-SNAPSHOT
+ 1.0.1-SNAPSHOTpomThe nifi-parent enables each apache nifi project to ensure consistent approaches and DRY
- http://nifi.incubator.apache.org
+ http://nifi.apache.org
- Apache NiFi(incubating) Project
- http://nifi.incubator.apache.org/
+ Apache NiFi Project
+ http://nifi.apache.org/
@@ -40,26 +40,33 @@
Dev
- dev-subscribe@nifi.incubator.apache.org
- dev-unsubscribe@nifi.incubator.apache.org
- dev@nifi.incubator.apache.org
- http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev
+ dev-subscribe@nifi.apache.org
+ dev-unsubscribe@nifi.apache.org
+ dev@nifi.apache.org
+ http://mail-archives.apache.org/mod_mbox/nifi-dev
+
+
+ Users
+ users-subscribe@nifi.apache.org
+ users-unsubscribe@nifi.apache.org
+ users@nifi.apache.org
+ http://mail-archives.apache.org/mod_mbox/nifi-usersCommits
- commits-subscribe@nifi.incubator.apache.org
- commits-unsubscribe@nifi.incubator.apache.org
- commits@nifi.incubator.apache.org
- http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits
+ commits-subscribe@nifi.apache.org
+ commits-unsubscribe@nifi.apache.org
+ commits@nifi.apache.org
+ http://mail-archives.apache.org/mod_mbox/nifi-commits${maven.min-version}
- scm:git:git://git.apache.org/incubator-nifi.git
- scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git
- https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git
+ scm:git:git://git.apache.org/nifi.git
+ scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git
+ https://git-wip-us.apache.org/repos/asf?p=nifi.gitHEAD
diff --git a/nifi/DISCLAIMER b/nifi/DISCLAIMER
deleted file mode 100644
index 0f8e7a1ecc..0000000000
--- 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/
diff --git a/nifi/README.md b/nifi/README.md
index cffa09ad87..a680f7899b 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
diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
index d8cb3fa175..5ea116ec4d 100644
--- a/nifi/nifi-api/pom.xml
+++ b/nifi/nifi-api/pom.xml
@@ -18,7 +18,7 @@
org.apache.nifinifi
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnifi-apijar
diff --git a/nifi/nifi-assembly/README.md b/nifi/nifi-assembly/README.md
index 106505dbff..4fb4d3b458 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
diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index 473b947ec5..8677c60f9b 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. -->
org.apache.nifinifi
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnifi-assemblypom
- This is the assembly Apache NiFi (incubating)
+ This is the assembly Apache NiFi
@@ -175,7 +175,7 @@ language governing permissions and limitations under the License. -->
org.apache.nifinifi-dbcp-service-nar
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnar
@@ -191,25 +191,25 @@ language governing permissions and limitations under the License. -->
org.apache.nifinifi-social-media-nar
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnarorg.apache.nifinifi-hl7-nar
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnarorg.apache.nifinifi-language-translation-nar
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnarorg.apache.nifinifi-geo-nar
- 0.2.1-incubating-SNAPSHOT
+ 0.2.1-SNAPSHOTnar
@@ -398,10 +398,10 @@ language governing permissions and limitations under the License. -->
org.codehaus.mojorpm-maven-plugin
- Apache NiFi (incubating)
- Apache Nifi (incubating) is dataflow system based on the Flow-Based Programming concepts.
+ Apache NiFi
+ Apache NiFi is dataflow system based on the Flow-Based Programming concepts.Apache License, Version 2.0 and others (see included LICENSE file)
- http://nifi.incubator.apache.org
+ http://nifi.apache.orgUtilities/opt/nifi
@@ -436,9 +436,6 @@ language governing permissions and limitations under the License. -->
-