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 2020/08/18 21:01:44 UTC

svn commit: r1880973 - in /nifi/site/trunk: download.html fds-release-guide.html quickstart.html release-guide.html

Author: joewitt
Date: Tue Aug 18 21:01:44 2020
New Revision: 1880973

URL: http://svn.apache.org/viewvc?rev=1880973&view=rev
Log:
NIFI-7692 RC1 1.12.0 passed

Modified:
    nifi/site/trunk/download.html
    nifi/site/trunk/fds-release-guide.html
    nifi/site/trunk/quickstart.html
    nifi/site/trunk/release-guide.html

Modified: nifi/site/trunk/download.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1880973&r1=1880972&r2=1880973&view=diff
==============================================================================
--- nifi/site/trunk/download.html (original)
+++ nifi/site/trunk/download.html Tue Aug 18 21:01:44 2020
@@ -128,56 +128,56 @@
     <div class="large-12 columns">
         <h2>Releases</h2>
         <ul>
-            <li><h3>1.11.4</h3>
+            <li><h3>1.12.0</h3>
                 <ul>
                     <li>Released March 22, 2020</li>
                     <li>
                         Sources:
                         <ul>
-                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.11.4/nifi-1.11.4-source-release.zip">nifi-1.11.4-source-release.zip</a> [53 MB] ( <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-source-release.zip.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-source-release.zip.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-source-release.zip.sha512">sha512</a> )</li>
+                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.12.0/nifi-1.12.0-source-release.zip">nifi-1.12.0-source-release.zip</a> ( <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-source-release.zip.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-source-release.zip.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-source-release.zip.sha512">sha512</a> )</li>
                         </ul>
                     </li>
                     <li>
                         Binaries
                         <ul>
-                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.11.4/nifi-1.11.4-bin.tar.gz">nifi-1.11.4-bin.tar.gz</a> [1.2 GB] ( <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-bin.tar.gz.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-bin.tar.gz.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-bin.tar.gz.sha512">sha512</a> )</li>
+                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.12.0/nifi-1.12.0-bin.tar.gz">nifi-1.12.0-bin.tar.gz</a> ( <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-bin.tar.gz.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-bin.tar.gz.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-bin.tar.gz.sha512">sha512</a> )</li>
 
-                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.11.4/nifi-1.11.4-bin.zip">nifi-1.11.4-bin.zip</a> [1.2 GB] ( <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-bin.zip.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-bin.zip.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-1.11.4-bin.zip.sha512">sha512</a> )</li>
+                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.12.0/nifi-1.12.0-bin.zip">nifi-1.12.0-bin.zip</a> ( <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-bin.zip.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-bin.zip.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-1.12.0-bin.zip.sha512">sha512</a> )</li>
 
 
-                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz">nifi-toolkit-1.11.4-bin.tar.gz</a> [42 MB] ( <a href="https://downloads.apache.org/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz.sha512">sha512</a> )</li>
+                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.12.0/nifi-toolkit-1.12.0-bin.tar.gz">nifi-toolkit-1.12.0-bin.tar.gz</a> ( <a href="https://downloads.apache.org/nifi/1.12.0/nifi-toolkit-1.12.0-bin.tar.gz.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-toolkit-1.12.0-bin.tar.gz.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-toolkit-1.12.0-bin.tar.gz.sha512">sha512</a> )</li>
 
-                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip">nifi-toolkit-1.11.4-bin.zip</a> [42 MB] ( <a href="https://downloads.apache.org/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip.sha512">sha512</a> )</li>
+                            <li><a href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.12.0/nifi-toolkit-1.12.0-bin.zip">nifi-toolkit-1.12.0-bin.zip</a> ( <a href="https://downloads.apache.org/nifi/1.12.0/nifi-toolkit-1.12.0-bin.zip.asc">asc</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-toolkit-1.12.0-bin.zip.sha256">sha256</a>, <a href="https://downloads.apache.org/nifi/1.12.0/nifi-toolkit-1.12.0-bin.zip.sha512">sha512</a> )</li>
                         </ul>
                     </li>
-                    <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.11.4">Release Notes</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.12.0">Release Notes</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance">Migration Guidance</a></li>
                 </ul>
             </li>
-            <li><h3>1.10.0</h3>
+            <li><h3>1.11.4</h3>
                 <ul>
                     <li>Released November 4, 2019</li>
                     <li><strong>Note: The download links pull from archive.apache.org.  Apache limits how much can be downloaded from this site per day so please avoid automated/continuous downloads from the archives</strong></li>
                     <li>
                         Sources:
                         <ul>
-                            <li><a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-source-release.zip">nifi-1.10.0-source-release.zip</a> [52 MB] ( <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-source-release.zip.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-source-release.zip.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-source-release.zip.sha512">sha512</a> )</li>
+                            <li><a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-source-release.zip">nifi-1.11.4-source-release.zip</a> ( <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-source-release.zip.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-source-release.zip.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-source-release.zip.sha512">sha512</a> )</li>
                         </ul>
                     </li>
                     <li>
                         Binaries
                         <ul>
-                            <li><a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.tar.gz">nifi-1.10.0-bin.tar.gz</a> [1.2 GB] ( <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.tar.gz.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.tar.gz.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.tar.gz.sha512">sha512</a> )</li>
+                            <li><a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.tar.gz">nifi-1.11.4-bin.tar.gz</a> ( <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.tar.gz.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.tar.gz.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.tar.gz.sha512">sha512</a> )</li>
 
-                            <li><a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.zip">nifi-1.10.0-bin.zip</a> [1.2 GB] ( <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.zip.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.zip.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-1.10.0-bin.zip.sha512">sha512</a> )</li>
+                            <li><a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.zip">nifi-1.11.4-bin.zip</a> ( <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.zip.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.zip.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-1.11.4-bin.zip.sha512">sha512</a> )</li>
 
 
-                            <li><a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.tar.gz">nifi-toolkit-1.10.0-bin.tar.gz</a> [42 MB] ( <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.tar.gz.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.tar.gz.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.tar.gz.sha512">sha512</a> )</li>
+                            <li><a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz">nifi-toolkit-1.11.4-bin.tar.gz</a> ( <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.tar.gz.sha512">sha512</a> )</li>
 
-                            <li><a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.zip">nifi-toolkit-1.10.0-bin.zip</a> [42 MB] ( <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.zip.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.zip.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.10.0/nifi-toolkit-1.10.0-bin.zip.sha512">sha512</a> )</li>
+                            <li><a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip">nifi-toolkit-1.11.4-bin.zip</a> ( <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip.asc">asc</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip.sha256">sha256</a>, <a href="https://archive.apache.org/dist/nifi/1.11.4/nifi-toolkit-1.11.4-bin.zip.sha512">sha512</a> )</li>
                         </ul>
                     </li>
-                    <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.10.0">Release Notes</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.11.4">Release Notes</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance">Migration Guidance</a></li>
                 </ul>
             </li>

Modified: nifi/site/trunk/fds-release-guide.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/fds-release-guide.html?rev=1880973&r1=1880972&r2=1880973&view=diff
==============================================================================
--- nifi/site/trunk/fds-release-guide.html (original)
+++ nifi/site/trunk/fds-release-guide.html Tue Aug 18 21:01:44 2020
@@ -171,7 +171,7 @@ those variable values have been written
 <pre><br>
 Reference            Example value       Description<br>
 =========            ==============      ===========<br>
-${BRANCH}            master              the development branch on which the release is based.<br>
+${BRANCH}            main                the development branch on which the release is based.<br>
 ${NIFI_FDS_VERSION}  0.1.0               the version currently in development on the release branch.<br>
 ${NEXT_VERSION}      0.2.0-SNAPSHOT      the future version for development on the release branch.<br>
 ${JIRA_TICKET}       NIFI-2112           the JIRA ticket created by the release manager for the release tasks.<br>
@@ -184,7 +184,7 @@ ${VOTE_THREAD_URL}   <a href="https://li
 <p><em>To be practical but avoid confusion with future release details, these example values reflect the previous release<br>
 NiFi Flow Design System 0.1.0 RC2 release details.</em></p></li>
 </ul>
-<p>NOTE: The next version should be the next minor version if the release is based on a major version development branch (e.g master<br>
+<p>NOTE: The next version should be the next minor version if the release is based on a major version development branch (e.g main<br>
 or 0.x). The next version should be the next incremental version if the release is based on a minor version development branch (e.g<br>
 support/nifi-fds-1.1.x or support/nifi-fds-0.7.4). If this is the first incremental release (e.g. 1.2.1) for a minor release line the support<br>
 branch may need to be created.</p>
@@ -244,7 +244,7 @@ acceptable but the appropriate adjustmen
 <li>Create the next version in JIRA, if it doesn't already exist, so work can continue towards that release.</li>
 <li>Create meaningful release notes for this version if not already created.  <a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes">Enter them here</a> on<br>
 the NiFi wiki.</li>
-<li>Create a new branch off 'master' named after the JIRA ticket.
+<li>Create a new branch off 'main' named after the JIRA ticket.
 <pre><code class="language-bash">$ git checkout -b NIFI-FDS-${JIRA_TICKET}-RC${RC} ${BRANCH}
 </code></pre></li>
 <li>Ensure the the full application builds and all tests work by executing a build.
@@ -437,10 +437,10 @@ Here is the PMC vote thread: ${VOTE_THRE
 <li><p>Move convenience binaries and related artifacts from dist/dev to dist/release:</p>
 <pre><code>$ svn move -m &quot;NIFI-FDS-${JIRA_TICKET}&quot; https://dist.apache.org/repos/dist/dev/nifi/nifi-fds/nifi-fds-${NIFI_FDS_VERSION} https://dist.apache.org/repos/dist/release/nifi/nifi-fds/nifi-fds-${NIFI_FDS_VERSION}
 </code></pre></li>
-<li><p>Merge the release branch into master.</p>
-<pre><code>$ git checkout master
+<li><p>Merge the release branch into main.</p>
+<pre><code>$ git checkout main
 $ git merge --no-ff NIFI-FDS-${JIRA_TICKET}-RC${RC}
-$ git push asf master
+$ git push asf main
 </code></pre></li>
 <li><p>Publish to the npm registry</p>
 <pre><code>$ npm run publish

Modified: nifi/site/trunk/quickstart.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/quickstart.html?rev=1880973&r1=1880972&r2=1880973&view=diff
==============================================================================
--- nifi/site/trunk/quickstart.html (original)
+++ nifi/site/trunk/quickstart.html Tue Aug 18 21:01:44 2020
@@ -133,11 +133,11 @@ git config --global core.autocrlf false
 <pre><code>git clone https://gitbox.apache.org/repos/asf/nifi.git
 </code></pre>
 <p><br/><br>
-Then checkout the <code>master</code> branch (which should be the default)</p>
-<pre><code>git checkout master
+Then checkout the <code>main</code> branch (which should be the default)</p>
+<pre><code>git checkout main
 </code></pre>
 <p><br/><br>
-The <code>master</code> branch currently represents the next major release line (1.x). Substantial work here is underway to improve the NiFi's core framework and UI. If you are interested in building the 0.x baseline to include new components and bug fixes please checkout the 0.x branch.<br>
+The <code>main</code> branch currently represents the next major release line (1.x). Substantial work here is underway to improve the NiFi's core framework and UI. If you are interested in building the 0.x baseline to include new components and bug fixes please checkout the 0.x branch.<br>
 <br/></p>
 <pre><code>git checkout -b 0.x origin/0.x
 </code></pre>

Modified: nifi/site/trunk/release-guide.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/release-guide.html?rev=1880973&r1=1880972&r2=1880973&view=diff
==============================================================================
--- nifi/site/trunk/release-guide.html (original)
+++ nifi/site/trunk/release-guide.html Tue Aug 18 21:01:44 2020
@@ -171,7 +171,7 @@ those variable values have been written
 <pre><br>
 Reference            Example value       Description<br>
 =========            ==============      ===========<br>
-${BRANCH}            master              the development branch on which the release is based.<br>
+${BRANCH}            main                the development branch on which the release is based.<br>
 ${NIFI_VERSION}      0.7.0               the version currently in development on the release branch.<br>
 ${NEXT_VERSION}      0.8.0-SNAPSHOT      the future version for development on the release branch.<br>
 ${JIRA_TICKET}       NIFI-2112           the JIRA ticket created by the release manager for the release tasks.<br>
@@ -185,7 +185,7 @@ ${VOTE_THREAD_URL}   <a href="https://li
 <p><em>To be practical but avoid confusion with future release details, these example values reflect the previous release<br>
 NiFi 0.7.0 RC2 release details.</em></p></li>
 </ul>
-<p>NOTE: The next version should be the next minor version if the release is based on a major version development branch (e.g master<br>
+<p>NOTE: The next version should be the next minor version if the release is based on a major version development branch (e.g main<br>
 or 0.x). The next version should be the next incremental version if the release is based on a minor version development branch (e.g<br>
 support/nifi-1.1.x or support/nifi-0.7.4). If this is the first incremental release (e.g. 1.2.1) for a minor release line the support<br>
 branch may need to be created.</p>
@@ -259,7 +259,7 @@ acceptable but the appropriate adjustmen
 <li>Create the next version in JIRA, if it doesn't already exist, so work can continue towards that release.</li>
 <li>Create meaningful release notes for this version if not already created.  <a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes">Enter them here</a> on<br>
 the NiFi wiki.</li>
-<li>Create a new branch off 'master' named after the JIRA ticket.
+<li>Create a new branch off 'main' named after the JIRA ticket.
 <pre><code class="language-bash">$ git checkout -b ${JIRA_TICKET}-RC${RC} ${BRANCH}
 </code></pre></li>
 <li>Verify that Maven has sufficient heap space to perform the build tasks.  Some plugins and parts of the build<br>
@@ -309,8 +309,8 @@ problems that must be addressed before p
 </code></pre></li>
 <li>Verify and update if necessary to ensure Docker version information points to the next release version.  For instance, if version being released is 1.9.0, these values should be 1.9.0. This currently consists of two files:
 <ul>
-<li><a href="https://github.com/apache/nifi/blob/master/nifi-docker/dockerhub/Dockerfile#L24">nifi-docker/dockerhub/Dockerfile, Line 25</a>, and</li>
-<li><a href="https://github.com/apache/nifi/blob/master/nifi-docker/dockerhub/DockerImage.txt#L16">nifi-docker/dockerhub/DockerImage.txt, Line 16</a>.</li>
+<li><a href="https://github.com/apache/nifi/blob/main/nifi-docker/dockerhub/Dockerfile#L24">nifi-docker/dockerhub/Dockerfile, Line 25</a>, and</li>
+<li><a href="https://github.com/apache/nifi/blob/main/nifi-docker/dockerhub/DockerImage.txt#L16">nifi-docker/dockerhub/DockerImage.txt, Line 16</a>.</li>
 </ul></li>
 </ol>
 <h3>Step 3. Perform the release (RM)</h3>
@@ -483,19 +483,19 @@ Here is the PMC vote thread: ${VOTE_THRE
 <pre><code>$ svn move -m &quot;${JIRA_TICKET}&quot; https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION} https://dist.apache.org/repos/dist/release/nifi/${NIFI_VERSION}
 </code></pre></li>
 <li><p>In repository.apache.org go to the staging repository and select <code>release</code> and follow the instructions on the site.</p></li>
-<li><p>Merge the release branch into master. (this will result in a merge commit)</p>
-<pre><code>$ git checkout master
+<li><p>Merge the release branch into main. (this will result in a merge commit)</p>
+<pre><code>$ git checkout main
 $ git merge --no-ff ${JIRA_TICKET}-RC${RC}
-$ git push asf master
+$ git push asf main
 </code></pre></li>
 <li><p>Update Docker version information to point to the next release.  For instance, if the next version applied by Maven is 1.3.0-SNAPSHOT, these values should be updated to 1.3.0. This currently consists of two files:</p>
 <ul>
-<li><a href="https://github.com/apache/nifi/blob/master/nifi-docker/dockerhub/Dockerfile#L24">nifi-docker/dockerhub/Dockerfile, Line 25</a>, and</li>
-<li><a href="https://github.com/apache/nifi/blob/master/nifi-docker/dockerhub/DockerImage.txt#L16">nifi-docker/dockerhub/DockerImage.txt, Line 16</a>.</li>
+<li><a href="https://github.com/apache/nifi/blob/main/nifi-docker/dockerhub/Dockerfile#L24">nifi-docker/dockerhub/Dockerfile, Line 25</a>, and</li>
+<li><a href="https://github.com/apache/nifi/blob/main/nifi-docker/dockerhub/DockerImage.txt#L16">nifi-docker/dockerhub/DockerImage.txt, Line 16</a>.</li>
 </ul></li>
 <li><p>Commit and push the dockerhub module updates to the ASF repository:</p>
 <pre><code>git commit -m &quot;${JIRA_TICKET} Updated dockerhub module for next release&quot;
-git push asf master
+git push asf main
 </code></pre></li>
 <li><p>Update the NiFi website to point to the new download(s).  Remove older release artifacts from download page (leave<br>
 the current release and the previous one).  For the release just previous to this new one change the links to point to<br>