You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/12/27 21:10:16 UTC
svn commit: r1776194 [3/3] - in /nifi/site/trunk: ./ assets/js/ minifi/
Modified: nifi/site/trunk/release-guide.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/release-guide.html?rev=1776194&r1=1776193&r2=1776194&view=diff
==============================================================================
--- nifi/site/trunk/release-guide.html (original)
+++ nifi/site/trunk/release-guide.html Tue Dec 27 21:10:16 2016
@@ -41,7 +41,7 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
+ <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -66,6 +66,7 @@
<li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide">Contributor Guide</a></li>
<li><a href="mailing_lists.html">Mailing Lists</a></li>
<li><a href="people.html">People</a></li>
+ <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -82,10 +83,10 @@
<li class="has-dropdown">
<a href="#">ASF Links</a>
<ul class="dropdown">
- <li><a href="http://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
- <li><a href="http://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
- <li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
+ <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
+ <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
+ <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
+ <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
</ul>
</li>
<li>
@@ -102,47 +103,100 @@
<div class="large-12 columns">
<div class="large-space"></div>
<h1 id="apache-nifi-release-guidelines">Apache NiFi Release Guidelines</h1>
-<p>The purpose of this document is to capture and describe the steps involved in producing
+<p>The purpose of this document is to capture and describe the steps involved in producing
an official release of Apache NiFi. It is written specifically to someone acting in the
-capacity of a <a href="http://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a> (RM). </p>
+capacity of a <a href="https://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a> (RM). </p>
+<h2 id="the-objective">The objective</h2>
+<p>Our aim is to produce an official Apache release from an existing release branch. </p>
<h2 id="background-material">Background Material</h2>
<ul>
<li><p>These documents are necessary for all committers to be familiar with</p>
<ul>
-<li><a href="http://apache.org/licenses/LICENSE-2.0">Apache License V2.0</a></li>
-<li><a href="http://www.apache.org/legal/resolved.html">Apache Legal License/Resolved</a></li>
-<li><a href="http://www.apache.org/dev/apply-license.html">Apache How-to Apply License</a></li>
+<li><a href="https://apache.org/licenses/LICENSE-2.0">Apache License V2.0</a></li>
+<li><a href="https://www.apache.org/legal/resolved.html">Apache Legal License/Resolved</a></li>
+<li><a href="https://www.apache.org/dev/apply-license.html">Apache How-to Apply License</a></li>
</ul>
</li>
<li><p>These documents are necessary for someone acting as the RM</p>
<ul>
-<li><a href="http://www.apache.org/licenses/exports/">Apache Encryption Software / ECCN Info</a></li>
-<li><a href="http://www.apache.org/dev/release.html">Apache Release Policy</a></li>
-<li><a href="http://www.apache.org/dev/release-publishing">Apache Release Guide</a></li>
+<li><a href="https://www.apache.org/licenses/exports/">Apache Encryption Software / ECCN Info</a></li>
+<li><a href="https://www.apache.org/dev/release.html">Apache Release Policy</a></li>
+<li><a href="https://www.apache.org/dev/release-publishing">Apache Release Guide</a></li>
</ul>
</li>
<li><p>These documents are helpful for general environmental setup to perform releases</p>
<ul>
-<li><a href="http://www.apache.org/dev/openpgp.html">Apache PGP Info</a></li>
+<li><a href="https://www.apache.org/dev/openpgp.html">Apache PGP Info</a></li>
<li><a href="http://www.apache.org/dev/release-signing.html">Apache Release Signing</a></li>
-<li><a href="http://www.apache.org/dev/publishing-maven-artifacts.html">Apache Guide to publish Maven Artifacts</a></li>
+<li><a href="https://www.apache.org/dev/publishing-maven-artifacts.html">Apache Guide to publish Maven Artifacts</a></li>
</ul>
</li>
</ul>
-<h2 id="the-objective">The objective</h2>
-<p>Our aim is to produce an official Apache release.<br>The following is a list of the sorts of things that will be validated and are the basics to check
-when evaluating a release for a vote.</p>
-<h2 id="what-to-validate-and-how-to-validate-a-release">What to validate and how to Validate a release</h2>
+<h2 id="terms">Terms</h2>
<ul>
-<li>Are LICENSE and NOTICE file present in the source root and complete?<ul>
-<li>Specifically look in the *-sources.zip artifact and ensure these items are present at the root of the archive.</li>
+<li><strong>Release Manager</strong> (RM) - the Apache NiFi PMC Member or Committer acting as <a href="https://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a>
+for a particular release of Apache NiFi.</li>
+<li><strong>Release Candidate</strong> (RC) - an iteration of the release process that is proposed for a vote by the Apache NiFi
+Community.</li>
+<li><strong>Community</strong> - the <a href="https://www.apache.org/foundation/glossary.html#Community">community</a> of people with an interest
+in the improvement and advancement of Apache NiFi, including end-users, developers, evangelists, and advisers.</li>
+<li><strong>PMC</strong> - within the Apache NiFi community, members of the <a href="https://www.apache.org/foundation/glossary.html#PMC">PMC</a> oversee the ongoing project.</li>
+<li><strong>Committer</strong> - with the Apache NiFi community, <a href="https://www.apache.org/foundation/glossary.html#Committer">committers</a>
+have gain the privilege to commit changes to the Apache NiFi codebase.</li>
</ul>
+<h2 id="high-level-flow-of-a-release">High level flow of a release</h2>
+<ul>
+<li>The Apache NiFi community is constantly contributing to JIRA tickets assigned to the next release.</li>
+<li>At some point the number of tickets open/remaining for the next release begins to approach zero.</li>
+<li>A member of the community suggests a release and initiates a discussion.</li>
+<li>Someone volunteers to perform the Release Manager (RM) role for the release. (This can be a committer but Apache
+guides indicate a preference for a PMC member.)</li>
+<li>The RM validate the proposed release and stages the source code, Maven artifacts, and distributable files for a
+Release Candidate (RC).</li>
+<li>The RM initiates a vote on the RC by the NiFi community.</li>
+<li>If the NiFi community rejects the RC, the issues noted are resolved and another RC is generated.</li>
+<li>If the NiFi community accepts the RC, the staged source code, artifacts, and distribution files are moved to the
+appropriately locations for public release.</li>
+</ul>
+<h2 id="variable-reference-substitutions">Variable reference substitutions</h2>
+<p>Throughout this guide, references must be made to names and values that will vary from release to release. For clarity
+those variable values have been written like Bash variable references. When a term like
+"<code>/tmp/src/nifi-${NIFI_VERSION}</code>" is seen in an instruction or email template it should be replaced with
+"<code>/tmp/src/nifi-0.7.0</code>" when working the release of "Apache NiFi 0.7.0".</p>
+<ul>
+<li><p>Subtitutions used in tasks and email templates</p>
+ <pre>
+ Reference Example value Description
+ ========= ============== ===========
+ ${BRANCH} 0.7.0-SNAPSHOT the development branch on which the release is based.
+ ${NIFI_VERSION} 0.7.0 the version currently in development on the release branch.
+ ${NEXT_VERSION} 0.7.1-SNAPSHOT the future version for development on the release branch.
+ ${JIRA_TICKET} NIFI-2112 the JIRA ticket created by the release manager for the release tasks.
+ ${RC} 2 the Release Candidate index start at 1 for the first release candidate.
+ ${RC_TAG_COMMIT_ID} the commit ID of the RC tag created during the Maven release process.
+ ${STAGING_REPO_ID} orgapachenifi-1088 the temporate repository ID where staged artifacts have been placed.
+ ${RM_USERID} johndoe the Apache account ID of Release Manager.
+ ${RELEASE_TAG} rel/nifi-0.7.0 the Git repository tag for the source code as released.
+ ${VOTE_THREAD_URL} [0.7.0 vote thread][070-rc2-vote] the URL for the Apache Pony Mail archive of the release vote thread.
+ </pre>
+
+<p> <em>To be practical but avoid confusion with future release details, these example values reflect the previous release
+NiFi 0.7.0 RC2 release details.</em></p>
</li>
-<li>Evaluate the sources and dependencies. Does the overall LICENSE and NOTICE appear correct? Do all licenses fit within the ASF approved licenses?<ul>
-<li>Here is an example path to a sources artifact: <ul>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1/nifi-0.0.1-source-release.zip</code></li>
+</ul>
+<h2 id="what-to-validate-and-how-to-validate-a-release">What to validate and how to validate a release</h2>
+<p>The following is a list of the sorts of things that will be validated and are the basics to check
+when evaluating a release for a vote.</p>
+<ul>
+<li>Are the LICENSE and NOTICE files present in the source root and complete?<ul>
+<li>Specifically look in the <code>nifi-${NIFI_VERSION}-sources-release.zip</code> artifact and ensure these files are
+present at the root of the archive.</li>
</ul>
</li>
+<li>Evaluate the sources and dependencies.<ul>
+<li>Does the overall LICENSE and NOTICE appear correct?</li>
+<li>Do all licenses fit within the ASF approved licenses?</li>
+<li>Here is an example path to a sources artifact that has been prepared but not released:<br><code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip</code></li>
</ul>
</li>
<li>Is there a README available that explains how to build the application and to execute it?<ul>
@@ -150,16 +204,12 @@ when evaluating a release for a vote.</p
</ul>
</li>
<li>Are the signatures and hashes correct for the source release?<ul>
-<li>Validate the hashes of the sources artifact do in fact match:<ul>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1/nifi-0.0.1-source-release.zip.md5</code></li>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1/nifi-0.0.1-source-release.zip.sha1</code></li>
-</ul>
-</li>
-<li>Validate the signature of the source artifact. Here is an example path:<ul>
-<li><code>https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1/nifi-0.0.1-source-release.zip.asc</code></li>
-<li>Need a quick reminder on how to <a href="http://www.apache.org/dev/release-signing.html#verifying-signature">verify a signature</a>?</li>
-</ul>
-</li>
+<li>Validate the hashes of the sources artifact do in fact match:
+<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.md5</code>
+<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha1</code></li>
+<li>Validate the signature of the source artifact. Here is an example path:
+<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.asc</code></li>
+<li>Need a quick reminder on how to <a href="https://www.apache.org/dev/release-signing.html#verifying-signature">verify a signature</a>?</li>
</ul>
</li>
<li>Do all sources have necessary headers?<ul>
@@ -172,70 +222,103 @@ when evaluating a release for a vote.</p
</li>
<li>Does the app (if appropriate) execute and function as expected?</li>
</ul>
-<h2 id="the-flow-of-a-release-an-outline-">The flow of a release (an outline)</h2>
-<ul>
-<li>The community is contributing to a series of JIRA tickets assigned to the next release</li>
-<li>The number of tickets open/remaining for that next release approaches zero</li>
-<li>A member of the community suggests a release and initiates a discussion</li>
-<li>Someone volunteers to be an RM for the release (can be a committer but apache guides indicate preference is a PMC member)</li>
-<li>A release candidate is put together and a vote sent to the team.</li>
-<li>If the NiFi community rejects the vote the issues noted are resolved and another RC is generated</li>
-<li>If the NiFi community accepts the vote then the release is 'releasable' and can be placed into the appropriate 'dist' location, maven artifacts released from staging.</li>
-</ul>
-<h2 id="the-mechanics-of-the-release">The mechanics of the release</h2>
-<h3 id="prepare-your-environment">Prepare your environment</h3>
-<p>Follow the steps outlined in the <a href="http://nifi.apache.org/quickstart.html">Quickstart Guide</a></p>
-<pre><code>At this point you're on the latest 'master' branch and are able to build the entire application</code></pre>
-<p><br/>
-Create a JIRA ticket for the release tasks and use that ticket number for the commit messages. For example we'll consider NIFI-270 as our ticket. Also
-have in mind the release version you are planning for. For example we'll consider '0.0.1'.</p>
-<p>Create the next version in JIRA if necessary so work can continue towards that release.</p>
-<p>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></p>
-<p>Create new branch off 'master' named after the JIRA ticket. Here we'll use a branch off of 'master' with
-<code>git checkout -b NIFI-270-RC1</code></p>
-<p>Verify that Maven has sufficient heap space to perform the build tasks. Some plugins and parts of the build
-consumes a surprisingly large amount of space. These settings have been shown to
-work <code>MAVEN_OPTS="-Xms1024m -Xmx3076m -XX:MaxPermSize=256m"</code></p>
-<p>Ensure your settings.xml has been updated as shown below. There are other ways to ensure your PGP key is available for signing as well</p>
-<pre><code> ...
- <profile>
- <id>signed_release</id>
- <properties>
- <mavenExecutorId>forked-path</mavenExecutorId>
- <gpg.keyname>YOUR GPG KEY ID HERE</gpg.keyname>
- <gpg.passphrase>YOUR GPG PASSPHRASE HERE</gpg.passphrase>
- </properties>
- </profile>
- ...
- <servers>
- <server>
- <id>repository.apache.org</id>
- <username>YOUR USER NAME HERE</username>
- <password>YOUR MAVEN ENCRYPTED PASSWORD HERE</password>
- </server>
- </servers>
- ...</code></pre>
-<p>Ensure the the full application build and tests all work by executing
-<code>mvn -T 2.5C clean install</code> for a parallel build. Once that completes you can
-startup and test the application by <code>cd nifi-assembly/target</code> then run <code>bin/nifi.sh start</code> in the nifi build.
-The application should be up and running in a few seconds at <code>http://localhost:8080/nifi</code></p>
-<p>Evaluate and ensure the appropriate license headers are present on all source files. Ensure LICENSE and NOTICE files are complete and accurate.<br>Developers should always be keeping these up to date as they go along adding source and modifying dependencies to keep this burden manageable.<br>This command <code>mvn install -Pcontrib-check</code> should be run as well to help validate. If that doesn't complete cleanly it must be addressed.</p>
-<p>Now its time to have maven prepare the release so execute <code>mvn release:prepare -Psigned_release -DscmCommentPrefix="NIFI-270-RC1 " -Darguments="-DskipTests"</code>.
-Maven will ask:</p>
-<p><code>What is the release version for "Apache NiFi"? (org.apache.nifi:nifi) 0.0.1: :</code></p>
-<p>Just hit enter to accept the default.</p>
-<p>Maven will then ask:</p>
-<p><code>What is SCM release tag or label for "Apache NiFi"? (org.apache.nifi:nifi) nifi-0.0.1: :</code></p>
-<p>Enter <code>nifi-0.0.1-RC1</code> or whatever the appropriate release candidate (RC) number is.
-Maven will then ask:</p>
-<p><code>What is the new development version for "Apache NiFi"? (org.apache.nifi:nifi) 0.0.2-SNAPSHOT: :</code></p>
-<p>Just hit enter to accept the default.</p>
-<p>Now that preparation went perfectly it is time to perform the release and deploy artifacts to staging. To do that execute</p>
-<p><code>mvn release:perform -Psigned_release -DscmCommentPrefix="NIFI-270-RC1 " -Darguments="-DskipTests"</code></p>
-<p>That will complete successfully and this means the artifacts have been released to the Apache Nexus staging repository. You will see something like</p>
-<p><code>[INFO] * Closing staging repository with ID "orgapachenifi-1011".</code></p>
-<p>So if you browse to <code>https://repository.apache.org/#stagingRepositories</code> login with your Apache committer credentials and you should see <code>orgapachenifi-1011</code>. If you click on that you can inspect the various staged artifacts.</p>
-<p>Validate that all the various aspects of the staged artifacts appear correct</p>
+<p>This list is reflected in the Release Vote and Release Helper Guide emails that are sent once the release has been
+staged in the Git and Nexus repositories.</p>
+<h2 id="the-release-process">The Release Process</h2>
+<p>The release process includes steps to be performed by the Release Manager as well as the
+Apache NiFi developer community.</p>
+<h3 id="step-1-configure-the-build-environment-rm-and-community-">Step 1. Configure the build environment (RM and community)</h3>
+<ol>
+<li>Follow the steps outlined in the <a href="https://nifi.apache.org/quickstart.html">Quickstart Guide</a> to prepare the development system.</li>
+<li>Confirm that the local Git workspace is configured with an origin remote pointing to the RM's personal fork of the
+NiFi source and an "ASF" remote pointing to the Apache Git Repository for NiFi.<pre><code> $ git remote -v
+ asf https://git-wip-us.apache.org/repos/asf/nifi.git (fetch)
+ asf https://git-wip-us.apache.org/repos/asf/nifi.git (push)
+ origin https://github.com/${RM_USERID}/nifi.git (fetch)
+ origin https://github.com/${RM_USERID}/nifi.git (push)</code></pre>
+ Additional remotes will not cause a problem if these two are correct. Other configurations are perfectly
+ acceptable but the appropriate adjustments to the steps in this guide must be made by the release manager.</li>
+<li>Confirm that source code can be checked out for the branch being released.<pre><code> git checkout ${BRANCH}</code></pre>
+</li>
+<li>Confirm that the entire application builds correctly in the build environment.</li>
+</ol>
+<h3 id="step-2-prepare-and-stage-the-release-rm-">Step 2. Prepare and stage the release (RM)</h3>
+<ol>
+<li>Create a JIRA ticket for the release tasks for version ${NIFI<em>VERSION}.<br> <strong>_The resulting JIRA ticket number is referred to as</strong> ${JIRA_TICKET} <strong>in this guide.</strong></em></li>
+<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
+the NiFi wiki.</li>
+<li>Create a new branch off 'master' named after the JIRA ticket.<pre><code class="language-bash"> $ git checkout -b NIFI-<span class="variable">${JIRA_TICKET}</span>-RC<span class="variable">${RC}</span> <span class="variable">${BRANCH}</span></code></pre>
+</li>
+<li>Verify that Maven has sufficient heap space to perform the build tasks. Some plugins and parts of the build
+consumes a surprisingly large amount of space. <ul>
+<li>These settings have been shown to work for Java 8 for NiFi version 1.x and later.<pre><code class="language-bash">$ <span class="keyword">export</span> MAVEN_OPTS=<span class="string">"-Xms1024m -Xmx3076m"</span></code></pre>
+</li>
+<li>And these work for Java 7 for NiFi version 0.x.<pre><code>$ export MAVEN_OPTS="-Xms1024m -Xmx3076m -XX:MaxPermSize=256m"</code></pre>
+</li>
+</ul>
+</li>
+<li><p>Ensure your settings.xml has been updated to include a <code>signed_release</code> profile and a <code><server></code> entry for
+"repository.apache.org" as shown below. <a href="http://blog.sonatype.com/2009/10/maven-tips-and-tricks-encrypting-passwords">Steps to configure and encrypt Maven passwords</a>.
+There are other ways to ensure your PGP key is available for signing as well. </p>
+<pre><code class="language-XML"> <profile>
+ <id>signed_release</id>
+ <properties>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <gpg.keyname>${RM_USERID}@apache.org</gpg.keyname>
+ <gpg.passphrase>GPG passphrase</gpg.passphrase>
+ </properties>
+ </profile>
+
+ <servers>
+ <server>
+ <id>repository.apache.org</id>
+ <username>${RM_USERID}</username>
+ <password>ENCRYPTED PASSWORD HERE</password>
+ </server>
+ </servers></code></pre>
+</li>
+<li>Ensure the the full application builds and all tests work by executing a parallel (multi-threaded) build.<pre><code> $ mvn -T 2.5C clean install</code></pre>
+</li>
+<li>Startup and test the application with from the root source folder. After a few seconds, NiFi should be up and
+running at <a href="http://localhost:8080/nifi"><a href="http://localhost:8080/nifi">http://localhost:8080/nifi</a></a>.<pre><code> $ cd nifi-assembly/target/nifi-${NIFI_VERSION}-bin/nifi-${NIFI_VERSION}
+ $ bin/nifi.sh start</code></pre>
+</li>
+<li>Evaluate and ensure the appropriate license headers are present on all source files.</li>
+<li>Ensure LICENSE and NOTICE files are complete and accurate. (Developers should always be keeping these up to date as
+ they go along adding source and modifying dependencies to keep this burden manageable.)</li>
+<li>Build the project with the <code>contrib-check</code> profile enabled to validate contribution expectations and find any
+problems that must be addressed before proceeding. <pre><code> $ mvn install -Pcontrib-check</code></pre>
+</li>
+</ol>
+<h3 id="step-3-perform-the-release-rm-">Step 3. Perform the release (RM)</h3>
+<ol>
+<li>Now its time to have maven prepare the release with this command.<pre><code> $ mvn --batch-mode release:prepare \
+ -Psigned_release \
+ -DscmCommentPrefix="NIFI-${JIRA_TICKET}-RC${RC}" \
+ -Dtag="nifi-${NIFI_VERSION}-RC${RC}" \
+ -DreleaseVersion="${NIFI_VERSION}" \
+ -DdevelopmentVersion="${NEXT_VERSION}" \
+ -Darguments="-DskipTests"</code></pre>
+</li>
+<li><p>Review the release preparation results. If problems are found <code>$ mvn release:rollback</code> will reset the changes, or
+it may be necessary to run <code>$ mvn release:clean</code> to get the project to a state where it can be rebuilt.</p>
+</li>
+<li><p>If the preparation without problems, it is time to perform the release and deploy artifacts to staging.</p>
+<pre><code> $ mvn release:perform
+ -Psigned_release \
+ -DscmCommentPrefix="${JIRA_TICKET}-RC${RC}"
+ -Darguments="-DskipTests"</code></pre>
+<p> When this completes the artifacts have been released to the Apache Nexus staging repository, a local release branch
+ has been created and there should the staging repository ID returned in a log entry like this.</p>
+<pre><code> [INFO] * Closing staging repository with ID "orgapachenifi-1088"</code></pre>
+<p> <strong><em>This staging repository ID is referred to by ${STAGING_REPO_ID} in this release guide.</em></strong></p>
+</li>
+<li><p>Browse to the Apache <a href="https://repository.apache.org/#stagingRepositories">Staging Repository</a> and
+login with your Apache committer credentials and you should see the newly created staging repository listed. If you
+click on that you can inspect the various staged artifacts.</p>
+</li>
+<li><p>Validate that all the various aspects of the staged artifacts appear correct</p>
<ul>
<li>Download the sources. Do they compile cleanly? If the result is a build does it execute?</li>
<li>Validate the hashes match.</li>
@@ -244,40 +327,72 @@ Maven will then ask:</p>
<li>Validate the LICENSE/NOTICE/Headers. </li>
<li>Validate that the README is present and provides sufficient information to build and if necessary execute.</li>
</ul>
-<p>If all looks good then push the branch to origin <code>git push origin NIFI-270</code></p>
-<p>For reviewing of the release candidate - The sources, hashes, signature, and the convenience binary, its hashes, and signature should be placed here:</p>
-<pre><code>- https://dist.apache.org/repos/dist/dev/nifi-0.0.1/</code></pre>
-<p><br/>
-For each convenience binary</p>
-<pre><code>- Generate ascii armored detached signature by running `gpg -a -b --digest-algo=SHA512 nifi-0.0.1-bin.tar.gz`
-- Generate md5 hash summary by running `md5sum nifi-0.0.1-bin.tar.gz | awk '{ printf substr($0,0,32)}' > nifi-0.0.1-bin.tar.gz.md5`
-- Generate sha1 hash summary by running `sha1sum nifi-0.0.1-bin.tar.gz | awk '{ printf substr($0,0,40)}' > nifi-0.0.1-bin.tar.gz.sha1`
-- Upload the bin, asc, sha1, md5 for each binary convenience build to the same location as the source release</code></pre>
-<p><br/>
-If anything isn't correct about the staged artifacts you can drop the staged repo from repository.apache.org and delete the
-local tag in git. If you also delete the local branch and clear your local maven repository under org/apache/nifi then it is
-as if the release never happened. Before doing that though try to figure out what went wrong. So as described here you see
-that you can pretty easily test the release process until you get it right. The <code>mvn versions:set</code> and <code>mvn versions:commit</code>
-commands can come in handy to help do this so you can set versions to something clearly release test related.</p>
-<p>Now it's time to initiate a vote within the NiFi community. Send the vote request to <code>dev@nifi.apache.org</code>
-with a subject of <code>[VOTE] Release Apache NiFi 0.0.1</code>. The following template can be used:</p>
-<pre><code>Hello
-I am pleased to be calling this vote for the source release of Apache NiFi
-nifi-0.0.1.
+</li>
+<li><p>The validated artifacts all look good then push the branch to origin release branch to the ASF repository.</p>
+<pre><code> $ git push asf NIFI-${JIRA_TICKET}-RC${RC}</code></pre>
+</li>
+<li><p>Create the signature and hashes for the source release and convenience binary files.</p>
+<ol>
+<li>ASCII armored GPG signatures (<code>--digest-algo=SHA512</code> select the SHA512 hash algorithm). <a href="https://www.apache.org/dev/openpgp.html#key-gen-avoid-sha1">Configure GPG to always prefer stronger hashes</a>.<pre><code> $ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-source-release.zip # produces nifi-${NIFI_VERSION}-source-release.zip.asc
+ $ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-bin.tar.gz # produces nifi-${NIFI_VERSION}-bin.tar.gz.asc
+ $ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-bin.zip # produces nifi-${NIFI_VERSION}-bin.zip.asc</code></pre>
+</li>
+<li>Generate md5 hash summaries.<pre><code> $ md5sum nifi-${NIFI_VERSION}-source-release.zip | cut -d" " -f1 > nifi-${NIFI_VERSION}-source-release.zip.md5
+ $ md5sum nifi-${NIFI_VERSION}-bin.tar.gz | cut -d" " -f1 > nifi-${NIFI_VERSION}-bin.tar.gz.md5
+ $ md5sum nifi-${NIFI_VERSION}-bin.zip | cut -d" " -f1 > nifi-${NIFI_VERSION}-bin.zip.md5</code></pre>
+</li>
+<li>Generate SHA1 hash summaries.<pre><code> $ sha1sum nifi-${NIFI_VERSION}-source-release.zip | cut -d" " -f1 > nifi-${RELEASAE}-source-release.zip.sha1
+ $ sha1sum nifi-${NIFI_VERSION}-bin.tar.gz | cut -d" " -f1 > nifi-${RELEASAE}-bin.tar.gz.sha1
+ $ sha1sum nifi-${NIFI_VERSION}-bin.zip | cut -d" " -f1 > nifi-${RELEASAE}-bin.zip.sha1</code></pre>
+</li>
+<li>Generate SHA256 hash summaries.<pre><code> $ shasum -a 256 nifi-${NIFI_VERSION}-source-release.zip | cut -d" " -f1 > nifi-${NIFI_VERSION}-source-release.zip.sha256
+ $ shasum -a 256 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d" " -f1 > nifi-${NIFI_VERSION}-bin.tar.gz.sha256
+ $ shasum -a 256 nifi-${NIFI_VERSION}-bin.zip | cut -d" " -f1 > nifi-${NIFI_VERSION}-bin.zip.sha256</code></pre>
+</li>
+</ol>
+</li>
+<li><p>For reviewing of the release candidate, commit the source release and convenience binaries files along with their
+hashes and signatures to <code>https://dist.apache.org/repos/dist/dev/nifi-${NIFI_VERSION}</code>.</p>
+</li>
+</ol>
+<h3 id="step-4-error-recovery-rm-">Step 4. Error recovery (RM)</h3>
+<p>If anything isn't correct about the staged artifacts you can drop the staged repo from repository.apache.org and delete
+the local tag in git. If you also delete the local branch and clear your local maven repository under org/apache/nifi
+then it is as if the release never happened. Before doing that though try to figure out what went wrong so the Release
+Guide can be updated or corrected if necessary.</p>
+<p>So, as has been described here you can test the release process until you get it right. The <code>mvn versions:set</code> and
+<code>mvn versions:commit</code> commands can come in handy to help do this so you can set versions to something clearly release
+test related.</p>
+<h3 id="step-5-release-vote-rm-and-community-">Step 5. Release Vote (RM and community)</h3>
+<p>After the release source and artifacts are staged in the repositories it's time for the RM to send a release vote to the
+NiFi community. </p>
+<p>Once the release vote is called for, members of the NiFi developer community have 72 hours to evaluate the RC and
+cast their vote by replying to the "[VOTE] Release ..." email sent by the RM.</p>
+<p><em>NOTE: The release vote is majority rule vote that must include at least 3 binding +1 votes Apache NiFi PMC members
+and more positive than negative binding votes.</em></p>
+<ol>
+<li><p>RM sends a vote request email to the NiFi Developers Mailing List.</p>
+<ul>
+<li>TO: <code>dev@nifi.apache.org</code></li>
+<li>FROM: <code>${RM_USERID}@apache.org</code></li>
+<li><p>SUBJECT: <code>[VOTE] Release Apache NiFi ${NIFI_VERSION}</code></p>
+<pre><code>Hello,
+
+I am pleased to be calling this vote for the source release of Apache NiFi nifi-${NIFI_VERSION}.
The source zip, including signatures, digests, etc. can be found at:
-https://repository.apache.org/content/repositories/orgapachenifi-1011
+https://repository.apache.org/content/repositories/orgapachenifi-nnnn
-The Git tag is nifi-0.0.1-RC1
-The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
-https://git-wip-us.apache.org/repos/asf?p=nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
-
-Checksums of nifi-0.0.1-source-release.zip:
-MD5: 5a580756a17b0573efa3070c70585698
-SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
+The Git tag is nifi-${NIFI_VERSION}-RC${RC}
+The Git commit ID is <40-BYTE-COMMIT-HASH>
+https://git-wip-us.apache.org/repos/asf?p=nifi.git;a=commit;h=<40-BYTE-COMMIT-HASH>
+
+Checksums of nifi-x.y.z-source-release.zip:
+MD5: <32-BYTE-MD5SUM-HASH>
+SHA1: <40-BYTE-SHA1SUM-HASH>
Release artifacts are signed with the following key:
-https://people.apache.org/keys/committer/joewitt.asc
+https://people.apache.org/keys/committer/${RM_USERID}.asc
KEYS file available here:
https://dist.apache.org/repos/dist/release/nifi/KEYS
@@ -286,79 +401,170 @@ https://dist.apache.org/repos/dist/relea
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329307
Release note highlights can be found here:
-https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version0.0.1
+https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version${NIFI_VERSION}
-The vote will be open for 72 hours.
-Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote:
+The vote will be open for 72 hours.
+Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build
+from source, and test. The please vote:
-[ ] +1 Release this package as nifi-0.0.1
+[ ] +1 Release this package as nifi-${NIFI_VERSION}
[ ] +0 no opinion
[ ] -1 Do not release this package because because...</code></pre>
-<p><br/>
-A release vote is majority rule. So wait 72 hours and see if there are at least 3 binding (PMC members) +1 votes and no more negative votes than positive.
-If the vote passes then send a vote result email. Send the email to <code>dev@nifi.apache.org</code>
-with a subject of <code>[RESULT][VOTE] Release Apache NiFi 0.0.1</code>. Use a template such as:</p>
-<pre><code>Hello
+</li>
+</ul>
+</li>
+<li><p>RM sends the following helper email to the NiFi Developers Mailing List.</p>
+<ul>
+<li>TO: <code>dev@nifi.apache.org</code></li>
+<li>FROM: <code>${RM_USERID}@apache.org</code></li>
+<li><p>SUBJECT: <code>Apache NiFi ${NIFI_VERSION} RC${RC} Release Helper Guide</code></p>
+<pre><code>Hello Apache NiFi community,
-The release passes with
+Please find the associated guidance to help those interested in validating/verifying the release so they can vote.
-X +1 (binding) votes
-Y -1 (binding) votes
+# Download latest KEYS file:
+https://dist.apache.org/repos/dist/dev/nifi/KEYS
+
+# Import keys file:
+gpg --import KEYS
+
+# [optional] Clear out local maven artifact repository
+
+# Pull down nifi-${NIFI_VERSION} source release artifacts for review:
+
+wget https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip
+wget https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.asc
+wget https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.md5
+wget https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha1
+wget https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha256
+
+# Verify the signature
+gpg --verify nifi-${NIFI_VERSION}-source-release.zip.asc
+
+# Verify the hashes (md5, sha1, sha256) match the source and what was provided in the vote email thread
+md5sum nifi-${NIFI_VERSION}-source-release.zip
+sha1sum nifi-${NIFI_VERSION}-source-release.zip
+sha256sum nifi-${NIFI_VERSION}-source-release.zip
+
+# Unzip nifi-${NIFI_VERSION}-source-release.zip
+
+# Verify the build works including release audit tool (RAT) checks
+cd nifi-${NIFI_VERSION}
+mvn clean install -Pcontrib-check
+
+# Verify the contents contain a good README, NOTICE, and LICENSE.
+
+# Verify the git commit ID is correct
+
+# Verify the RC was branched off the correct git commit ID
+
+# Look at the resulting convenience binary as found in nifi-assembly/target
+
+# Make sure the README, NOTICE, and LICENSE are present and correct
+
+# Run the resulting convenience binary and make sure it works as expected
+
+# Send a response to the vote thread indicating a +1, 0, -1 based on your findings.
+
+Thank you for your time and effort to validate the release!</code></pre>
+</li>
+</ul>
+</li>
+<li><p>Developers in the community review the release candiate and reply to the vote email with their vote.</p>
+</li>
+<li><p>After 72 hours if</p>
+<ul>
+<li>at least 3 binding (PMC members) cast +1 votes, and</li>
+<li>the positive binding votes out number any negative binding votes</li>
+</ul>
+<p>the vote passes and the release candidate is officially released. If the vote does not pass, corrections are made
+on the release branch and a new release candidate is put forward for a new vote.</p>
+</li>
+<li><p>RM sends vote result email.</p>
+<ul>
+<li>TO: <code>dev@nifi.apache.org</code></li>
+<li>FROM: <code>${RM_USERID}@apache.org</code></li>
+<li><p>SUBJECT: <code>[RESULT][VOTE] Release Apache NiFi ${NIFI_VERSION}</code></p>
+<pre><code>Apache NiFi Community,
+
+I am pleased to announce that the ${NIFI_VERSION} release of Apache NiFi passes with
+ X +1 (binding) votes
+ Y -1 (binding) votes
+ 0 0 votes
+ 0 -1 votes
Thanks to all who helped make this release possible.
-Here is the PMC vote thread: [INSERT URL OF PMC Vote Thread]</code></pre>
-<p><br/>
-Now all the voting is done and the release is good to go.</p>
-<p>Here are the steps of the release once the release is approved:</p>
+Here is the PMC vote thread: ${VOTE_THREAD_URL}</code></pre>
+</li>
+</ul>
+</li>
+</ol>
+<h3 id="step-6-finalize-the-release">Step 6. Finalize the Release</h3>
+<p>After the vote is complete and the release is approved, these steps complete the release process.</p>
<ol>
-<li>Move convenience binaries and related artifacts from dist/dev to dist/release:<br><code>svn move -m "NIFI-1122" https://dist.apache.org/repos/dist/dev/nifi/nifi-0.0.1 https://dist.apache.org/repos/dist/release/nifi/0.0.1</code>
-<br/></li>
-<li><p>In repository.apache.org go to the staging repository and select <code>release</code> and follow instructions on the site.</p>
+<li>Move convenience binaries and related artifacts from dist/dev to dist/release: <pre><code> $ svn move -m "NIFI-${JIRA_TICKET}" 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</p>
+<li><p>Merge the release branch into master.</p>
+<pre><code> $ git push asf NIFI-${JIRA_TICKET}</code></pre>
</li>
-<li><p>Update the NiFi website to point to the new download(s). Remove older release artifacts from download page (leave the current release and the previous one). For the release just previous to this new one change the links to point to the archive location. See current page as an example of the needed URL changes. In addition to updating the download page as described delete artifacts other than the current/new release from the dist/nifi SVN storage. They are already in the archive location so no need to do anything else.</p>
+<li><p>Update the NiFi website to point to the new download(s). Remove older release artifacts from download page (leave
+the current release and the previous one). For the release just previous to this new one change the links to point to
+the archive location. See current page as an example of the needed URL changes. In addition to updating the download
+page as described delete artifacts other than the current/new release from the dist/nifi SVN storage. They are already
+in the archive location so no need to do anything else.</p>
</li>
<li><p>Update the <a href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance">Migration Guide</a> on the Wiki.</p>
</li>
<li><p>Update the NiFi Web Page to indicate NEWS of the release as appropriate</p>
</li>
-<li><p>From a nifi.tar.gz collect the docs/html/* files and svn commit them to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/html/">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/html/</a></p>
-</li>
-<li><p>From a nifi.tar.gz collect the nifi-framework-nar.nar/META-INF/bundled-dependencies/nifi-web-api.war/docs/rest-api/* files and svn commit them to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/rest-api/">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/rest-api/</a></p>
-</li>
-<li><p>Run an instance of nifi</p>
+<li><p>If the release is on the latest development line, update the NiFi website documentation pages to match the release.</p>
+<ol>
+<li>From a nifi.tar.gz collect the docs/html/* files and svn commit them to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/html/">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/html/</a></li>
+<li>From a nifi.tar.gz collect the nifi-framework-nar.nar/META-INF/bundled-dependencies/nifi-web-api.war/docs/rest-api/* files and svn commit them to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/rest-api/">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/rest-api/</a></li>
+<li>Run an instance of nifi</li>
+<li>Copy nifi/work/docs/components/* and svn commit to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/components/">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/components/</a></li>
+<li>wget <a href="http://localhost:8080/nifi-docs/documentation">http://localhost:8080/nifi-docs/documentation</a> and svn commit to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/index.html">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/index.html</a></li>
+</ol>
</li>
-<li><p>Copy nifi/work/docs/components/* and svn commit to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/components/">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/components/</a></p>
+<li><p>In Jira mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console.</p>
</li>
-<li><p>wget <a href="http://localhost:8080/nifi-docs/documentation">http://localhost:8080/nifi-docs/documentation</a> and svn commit to <a href="https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/index.html">https://svn.apache.org/repos/asf/nifi/site/trunk/docs/nifi-docs/index.html</a></p>
+<li><p>Create a proper signed tag of the released codebase based on the RC Tag craeted during the Maven release process.</p>
+<pre><code>$ git tag -s rel/nifi-${NIFI_VERSION} -m "${JIRA_TICKET} signed release tag for approved release of NiFi ${NIFI_VERSION}" ${RC_TAG_COMMIT_ID}</code></pre>
+<p>For instructions on setting up to sign your tag see <a href="http://gitready.com/advanced/2014/11/02/gpg-sign-releases.html">here</a>. </p>
</li>
-<li><p>In Jira mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console.</p>
+<li><p>Push the release tag to the official ASF repository.</p>
+<pre><code>$ git push asf rel/nifi-${NIFI_VERSION} rel/nifi-${NIFI_VERSION}</code></pre>
</li>
-<li><p>Create a proper signed tag of the released codebase. If the approved RC tag was 'nifi-0.0.1-RC1' then create a signed release tag of 'rel/nifi-0.0.1'. For instructions on setting up to sign your tag see <a href="http://gitready.com/advanced/2014/11/02/gpg-sign-releases.html">here</a>. To create a signed release tag enter <code>git tag -s rel/nifi-0.0.1 -m "NIFI-XYZ Signed release tag for approved release of nifi 0.0.1" COMMIT-ID-OF-RC-TAG</code></p>
+<li><p>Update the release notes with the final date of the release.</p>
</li>
-<li><p>Wait 24 hours then send release announcement.</p>
+<li><p>After the release has been complete for 24 hours send the release announcement.</p>
<ul>
-<li>See <a href="http://www.apache.org/dev/release.html#release-announcements">here</a> for an understanding of why you need to wait 24 hours</li>
-<li>Then create an announcement like the one shown below addressed to 'announce@apache.org, dev@nifi..apache.org' with a reply-to of 'dev@nifi.apache.org'. </li>
-<li>The email has to be sent from an apache.org email address and should be by the release manager of the build.</li>
+<li>See <a href="https://www.apache.org/dev/release.html#release-announcements">here</a> for an understanding of why you need to wait 24 hours</li>
+<li>The announcement should addressed as follows.<ul>
+<li>TO: <code>announce@apache.org</code>, <code>dev@nifi.apache.org</code></li>
+<li>REPLY-TO: <code>dev@nifi.apache.org</code></li>
+<li>FROM: ${RM_USERID}@apache.org</li>
</ul>
</li>
-</ol>
-<pre><code>SUBJECT: [ANNOUNCE] Apache NiFi 0.0.1 release
-BODY:
-Hello
+<li>The subject should include <code>[ANNOUNCE] Apache NiFi x.y.z release</code>.</li>
+<li><p>The text should on the template included below.
++</p>
+<pre><code>Hello
-The Apache NiFi team would like to announce the release of Apache NiFi 0.0.1.
+The Apache NiFi team would like to announce the release of Apache NiFi ${NIFI_VERSION}.
-Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. Apache NiFi was made for dataflow. It supports highly configurable directed graphs of data routing, transformation, and system mediation logic.
+Apache NiFi is an easy to use, powerful, and reliable system to process and distribute
+data. Apache NiFi was made for dataflow. It supports highly configurable directed graphs
+of data routing, transformation, and system mediation logic.
More details on Apache NiFi can be found here:
-http://nifi.apache.org/
+https://nifi.apache.org/
The release artifacts can be downloaded from here:
-http://nifi.apache.org/download.html
+https://nifi.apache.org/download.html
Maven artifacts have been made available here:
https://repository.apache.org/content/repositories/releases/org/apache/nifi/
@@ -367,22 +573,26 @@ Issues closed/resolved for this list can
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329373
Release note highlights can be found here:
-https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version0.0.1
+https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version${NIFI_VERSION}
Thank you
The Apache NiFi team</code></pre>
+</li>
+</ul>
+</li>
+</ol>
</div>
</div>
<div class="row">
<div class="large-12 columns footer">
- <a href="http://www.apache.org">
+ <a href="https://www.apache.org">
<img id="asf-logo" alt="Apache Software Foundation" src="assets/images/feather-small.gif">
</a>
<div id="copyright">
<p>Copyright © 2015 The Apache Software Foundation, Licensed under the <a
- href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
+ href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
Foundation.</p>
</div>
Modified: nifi/site/trunk/videos.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/videos.html?rev=1776194&r1=1776193&r2=1776194&view=diff
==============================================================================
--- nifi/site/trunk/videos.html (original)
+++ nifi/site/trunk/videos.html Tue Dec 27 21:10:16 2016
@@ -41,7 +41,7 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
+ <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -66,6 +66,7 @@
<li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide">Contributor Guide</a></li>
<li><a href="mailing_lists.html">Mailing Lists</a></li>
<li><a href="people.html">People</a></li>
+ <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -82,10 +83,10 @@
<li class="has-dropdown">
<a href="#">ASF Links</a>
<ul class="dropdown">
- <li><a href="http://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
- <li><a href="http://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
- <li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
+ <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
+ <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
+ <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
+ <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
</ul>
</li>
<li>
@@ -203,12 +204,12 @@
<div class="row">
<div class="large-12 columns footer">
- <a href="http://www.apache.org">
+ <a href="https://www.apache.org">
<img id="asf-logo" alt="Apache Software Foundation" src="assets/images/feather-small.gif">
</a>
<div id="copyright">
<p>Copyright © 2015 The Apache Software Foundation, Licensed under the <a
- href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
+ href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
Foundation.</p>
</div>