Repository: incubator-apex-site Updated Branches: refs/heads/asf-site 3b2c11114 -> f0fdc916c
from 90b0863c7c2476832d7904605174ab3e3b71fb70 Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/f0fdc916 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/f0fdc916 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/f0fdc916 Branch: refs/heads/asf-site Commit: f0fdc916c392614860eb95588ac5f0a87f75fb4b Parents: 3b2c111 Author: Andy Perlitch <[email protected]> Authored: Fri Nov 13 10:32:52 2015 -0800 Committer: Andy Perlitch <[email protected]> Committed: Fri Nov 13 10:32:52 2015 -0800 ---------------------------------------------------------------------- content/community.html | 70 ++++---- content/contributing.html | 132 +++++++------- content/css/main.css | 399 ++++++++++++++++++++--------------------- content/docs.html | 20 +-- content/downloads.html | 10 +- content/release.html | 218 +++++++++++----------- 6 files changed, 423 insertions(+), 426 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/f0fdc916/content/community.html ---------------------------------------------------------------------- diff --git a/content/community.html b/content/community.html index acac340..aaa4ba2 100644 --- a/content/community.html +++ b/content/community.html @@ -73,41 +73,41 @@ <div class="container"> <h1 id="community">Community</h1> - <h2 id="mailing-lists">Mailing Lists</h2> - <p>The following mailing lists can be used to get help with Apex.</p> - <ul> - <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/";>[email protected]</a> is for people who want to contribute code to apex. <a href="mailto:[email protected]?subject=send%20this%20email%20to%20subscribe";>subscribe</a>, <a href="mailto:[email protected]?subject=send%20this%20email%20to%20unsubscribe";>unsubscribe</a>, <a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/";>archives</a></li> - <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-commits/";>[email protected]</a> is for commit messages and patches to apex. <a href="mailto:[email protected]?subject=send%20this%20email%20to%20subscribe";>subscribe</a>, <a href="mailto:[email protected]?subject=send%20this%20email%20to%20unsubscribe";>unsubscribe</a>, <a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-commits/";>archives</a></li> - </ul> - <h2 id="contributing">Contributing</h2> - <p><strong>To learn more about how we use Github to accept contributions to the project, <a href="/contributing.html">check out the contributing guidelines</a>.</strong></p> - <p>The Apex Project is made up of two repositories:</p> - <ul> - <li><a href="https://github.com/apache/incubator-apex-core";>Apex Core</a> - The core of the Apex platform.</li> - <li><a href="https://github.com/apache/incubator-apex-malhar";>Apex Malhar</a> - Community-driven set of open-source "operators" and utilities for use in your Apex applications.</li> - </ul> - <h2 id="release-process">Release Process</h2> - <p><strong>To learn more about the release process for Apex, <a href="/release.html">check out the release guidelines</a>.</strong></p> - <h2 id="issue-tracking">Issue Tracking</h2> - <ul> - <li><a href="https://malhar.atlassian.net/projects/APEX/issues";>Apex Core JIRA</a></li> - <li><a href="https://malhar.atlassian.net/projects/MLHR/issues";>Apex Malhar JIRA</a></li> - </ul> - <h2 id="upcoming-meetups">Upcoming Meetups</h2> - <ul> - <li>PubMatic to Share Real Time Insights for Advertising Tech using Apex @ MapR Office <a href="http://www.meetup.com/Apex-Bay-Area-Chapter/events/226184395/";>San Jose - Nov 19, 2015</a></li> - <li>Apache Apex â Deep Dive <a href="http://www.meetup.com/Apache-Apex-incubating-Meetup-Pune/events/226506211/";>Pune - Nov 25, 2015</a></li> - </ul> - <h2 id="meetup-groups">Meetup Groups</h2> - <ul> - <li><a href="http://www.meetup.com/Apache-Apex-Meetup-Chicago-Chapter";>Chicago Chapter</a></li> - <li><a href="http://www.meetup.com/Apex-Meetup-Houston";>Houston Chapter</a></li> - <li><a href="http://www.meetup.com/Apex-Meetup-Columbus";>Columbus Chapter</a></li> - <li><a href="http://www.meetup.com/Apache-Apex-New-York-Chapter";>New York Chapter</a></li> - <li><a href="http://www.meetup.com/Apache-Apex-incubating-Meetup-Pune";>Pune Chapter</a></li> - <li><a href="http://www.meetup.com/Apache-Apex-incubating-Bangalore-Meetup";>Bengaluru Chapter</a></li> - <li><a href="http://www.meetup.com/Apex-Bay-Area-Chapter";>Bay Area Chapter</a></li> - </ul> +<h2 id="mailing-lists">Mailing Lists</h2> +<p>The following mailing lists can be used to get help with Apex.</p> +<ul> +<li><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/";>[email protected]</a> is for people who want to contribute code to apex. <a href="mailto:[email protected]?subject=send%20this%20email%20to%20subscribe";>subscribe</a>, <a href="mailto:[email protected]?subject=send%20this%20email%20to%20unsubscribe";>unsubscribe</a>, <a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/";>archives</a></li> +<li><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-commits/";>[email protected]</a> is for commit messages and patches to apex. <a href="mailto:[email protected]?subject=send%20this%20email%20to%20subscribe";>subscribe</a>, <a href="mailto:[email protected]?subject=send%20this%20email%20to%20unsubscribe";>unsubscribe</a>, <a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-commits/";>archives</a></li> +</ul> +<h2 id="contributing">Contributing</h2> +<p><strong>To learn more about how we use Github to accept contributions to the project, <a href="/contributing.html">check out the contributing guidelines</a>.</strong></p> +<p>The Apex Project is made up of two repositories:</p> +<ul> +<li><a href="https://github.com/apache/incubator-apex-core";>Apex Core</a> - The core of the Apex platform.</li> +<li><a href="https://github.com/apache/incubator-apex-malhar";>Apex Malhar</a> - Community-driven set of open-source "operators" and utilities for use in your Apex applications.</li> +</ul> +<h2 id="release-process">Release Process</h2> +<p><strong>To learn more about the release process for Apex, <a href="/release.html">check out the release guidelines</a>.</strong></p> +<h2 id="issue-tracking">Issue Tracking</h2> +<ul> +<li><a href="https://malhar.atlassian.net/projects/APEX/issues";>Apex Core JIRA</a></li> +<li><a href="https://malhar.atlassian.net/projects/MLHR/issues";>Apex Malhar JIRA</a></li> +</ul> +<h2 id="upcoming-meetups">Upcoming Meetups</h2> +<ul> +<li>PubMatic to Share Real Time Insights for Advertising Tech using Apex @ MapR Office <a href="http://www.meetup.com/Apex-Bay-Area-Chapter/events/226184395/";>San Jose - Nov 19, 2015</a></li> +<li>Apache Apex â Deep Dive <a href="http://www.meetup.com/Apache-Apex-incubating-Meetup-Pune/events/226506211/";>Pune - Nov 25, 2015</a></li> +</ul> +<h2 id="meetup-groups">Meetup Groups</h2> +<ul> +<li><a href="http://www.meetup.com/Apache-Apex-Meetup-Chicago-Chapter";>Chicago Chapter</a></li> +<li><a href="http://www.meetup.com/Apex-Meetup-Houston";>Houston Chapter</a></li> +<li><a href="http://www.meetup.com/Apex-Meetup-Columbus";>Columbus Chapter</a></li> +<li><a href="http://www.meetup.com/Apache-Apex-New-York-Chapter";>New York Chapter</a></li> +<li><a href="http://www.meetup.com/Apache-Apex-incubating-Meetup-Pune";>Pune Chapter</a></li> +<li><a href="http://www.meetup.com/Apache-Apex-incubating-Bangalore-Meetup";>Bengaluru Chapter</a></li> +<li><a href="http://www.meetup.com/Apex-Bay-Area-Chapter";>Bay Area Chapter</a></li> +</ul> </div> http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/f0fdc916/content/contributing.html ---------------------------------------------------------------------- diff --git a/content/contributing.html b/content/contributing.html index 9c52632..798aa8e 100644 --- a/content/contributing.html +++ b/content/contributing.html @@ -73,72 +73,72 @@ <div class="container"> <h1 id="contributing-guidelines">Contributing Guidelines</h1> - <p>The apex core and apex malhar repositories both have mirror repositories on github which are used to review Pull Requests and provide a second remote endpoint for the codebase.</p> - <h2 id="opening-a-pull-request-contributors-">Opening a Pull Request (contributors)</h2> - <p>This project welcomes new contributors. If you would like to help by adding new features, enhancements or fixing bugs, here is how to do it.</p> - <ol> - <li>Create a <a href="https://malhar.atlassian.net/";>JIRA</a> for the work you plan to do (or assign yourself to an existing JIRA ticket)</li> - <li>Fork the ASF github mirror (one time step):<br><a href="https://github.com/apache/incubator-apex-core/";>https://github.com/apache/incubator-apex-core/</a> </li> - <li>Clone the <strong>fork</strong> on your local workspace (one time step):<br><code>git clone https://github.com/{github_username}/incubator-apex-core.git</code></li> - <li>Add <a href="https://github.com/apache/incubator-apex-core";>incubator apex core</a> as a remote repository (one time step):<br><code>git remote add upstream https://github.com/apache/incubator-apex-core</code></li> - <li>Create a new branch from the <a href="https://github.com/apache/incubator-apex-core/tree/devel-3";>devel-3</a> branch. <strong>Name your branch with the JIRA number in it, e.g. <code>APEX-123.my-feature</code>.</strong><br><code>git checkout -b APEX-123.my-feature -t upstream/devel-3</code><br>Creating a local branch that tracks a remote makes pull easier (no need to specify the remote branch while pulling). A branch can be made to track a remote branch anytime, not necessarily at its creation by:<br><code>git branch -u upstream/devel-3</code></li> - <li>When adding new files, please include the Apache v2.0 license header.<ul> - <li>From the top level directory, run <code>mvn license:check -Dlicense.skip=false</code> to check correct header formatting.</li> - <li>Run <code>mvn license:format -Dlicense.skip=false</code> to automatically add the header when missing.</li> - </ul> - </li> - <li>Once your feature is complete, submit the pull request on github against <code>devel-3</code>.</li> - <li>If you want specific people to review your pull request, use the <code>@</code> notation in Github comments to mention that user, and request that he/she reviews your changes.</li> - <li><p>After all review is complete, combine all new commits into one squashed commit, and include the Jira number in the commit message. There are several ways to squash commits, but [here is one explanation from git-scm.com]<br>(<a href="https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits";>https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits</a>) and a simple example is illustrated below:</p> - <p>If tracking upstream/devel-3 then run <code>git rebase -i</code>. Else run <code>git rebase -i upstream/devel-3</code>.<br>This command opens the text editor which lists the multiple commits:</p> - <pre><code>pick <span class="hljs-number">67</span>cd79b change1 - pick <span class="hljs-number">6</span>f98905 change2 - - <span class="hljs-preprocessor"># Rebase e13748b..3463fbf onto e13748b (2 command(s))</span> - <span class="hljs-preprocessor">#</span> - <span class="hljs-preprocessor"># Commands:</span> - <span class="hljs-preprocessor"># p, pick = use commit</span> - <span class="hljs-preprocessor"># r, reword = use commit, but edit the commit message</span> - <span class="hljs-preprocessor"># e, edit = use commit, but stop for amending</span> - <span class="hljs-preprocessor"># s, squash = use commit, but meld into previous commit</span> - <span class="hljs-preprocessor"># f, fixup = like "squash", but discard this commit's log message</span> - <span class="hljs-preprocessor"># x, exec = run command (the rest of the line) using shell</span> - <span class="hljs-preprocessor">#</span> - <span class="hljs-preprocessor"># These lines can be re-ordered; they are executed from top to bottom.</span> - </code></pre><p>Squash 'change2' to 'change1' and save.</p> - <pre><code>pick <span class="hljs-number">67</span>cd79b change1 - squash <span class="hljs-number">6f</span>98905 change2 - </code></pre></li> - <li>Till the review is complete it may happen that working feature branch may diverge from <code>devel-3</code> substantially. Therefore, it is recommended to frequently merge <code>devel-3</code> to the branch being worked on by:<ul> - <li>when the branch tracks upstream/devel-3<br><code>git pull</code></li> - <li>when the branch doesn't track upstream<br><code>git pull upstream devel-3</code></li> - </ul> - </li> - <li>If a pull from <code>devel-3</code> results in a conflict then resolve it and commit the merge. This results in additional merge commits in the pull request. Following steps help to ensure that the final pull request contains just one commit:<ul> - <li>Rename the original branch:<br><code>git branch -m APEX-123.my-feature.squash</code></li> - <li>Create a new branch (with the original name) from upstream/devel-3 that has latest changes:<br><code>git checkout -b APEX-123.my-feature -t upstream/devel-3</code></li> - <li>Squash merge the old branch which was renamed. When the new branch has the latest changes then this squash will result only in the changes that were made for the feature:<br><code>git merge --squash APEX-123.my-feature.squash</code></li> - <li>Commit the squash and force push it to the old feature remote branch so that the pull request is automatically updated:<br><code>git commit -m "APEX-123 #comment added my-feature"</code><br><code>git push origin +APEX-123.my-feature</code></li> - <li>Delete the extra squash branch:<br><code>git branch -D APEX-123.my-feature.squash</code></li> - </ul> - </li> - </ol> - <p>Thanks for contributing!</p> - <h2 id="merging-a-pull-request-committers-">Merging a Pull Request (committers)</h2> - <ol> - <li>Ensure that the basic requirements for a pull request are met. This includes:<ul> - <li>Commit messages need to reference JIRA (pull requests will be linked to ticket)</li> - <li>Travis CI pull request build needs to pass</li> - <li>Ensure tests are added/modified for new features or fixes</li> - <li>Ensure appropriate JavaDoc comments have been added</li> - </ul> - </li> - <li>To set up access to the ASF source repository, <a href="https://git-wip-us.apache.org/#committers-getting-started";>follow these steps</a>. The ASF master repository is: <code>https://git-wip-us.apache.org/repos/asf/incubator-apex-core.git</code></li> - <li>Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the <code>[email protected]</code> mailing list to see the exact commands to merge the given pull request.</li> - <li>Once done with verification, push the changes to the ASF repository's <code>devel-3</code> branch. Within a few<br>seconds, the changes will propagate back to the github mirror and the pull requests be closed and marked merged automatically.</li> - <li>The <code>Fix version</code> field on the corresponding JIRA ticket needs to be set after pushing the changes.</li> - </ol> - <p><strong>Note: since none of us has write access to the mirror, only the author of a pull request can close it if it was not merged.</strong></p> +<p>The apex core and apex malhar repositories both have mirror repositories on github which are used to review Pull Requests and provide a second remote endpoint for the codebase.</p> +<h2 id="opening-a-pull-request-contributors-">Opening a Pull Request (contributors)</h2> +<p>This project welcomes new contributors. If you would like to help by adding new features, enhancements or fixing bugs, here is how to do it.</p> +<ol> +<li>Create a <a href="https://malhar.atlassian.net/";>JIRA</a> for the work you plan to do (or assign yourself to an existing JIRA ticket)</li> +<li>Fork the ASF github mirror (one time step):<br><a href="https://github.com/apache/incubator-apex-core/";>https://github.com/apache/incubator-apex-core/</a> </li> +<li>Clone the <strong>fork</strong> on your local workspace (one time step):<br><code>git clone https://github.com/{github_username}/incubator-apex-core.git</code></li> +<li>Add <a href="https://github.com/apache/incubator-apex-core";>incubator apex core</a> as a remote repository (one time step):<br><code>git remote add upstream https://github.com/apache/incubator-apex-core</code></li> +<li>Create a new branch from the <a href="https://github.com/apache/incubator-apex-core/tree/devel-3";>devel-3</a> branch. <strong>Name your branch with the JIRA number in it, e.g. <code>APEX-123.my-feature</code>.</strong><br><code>git checkout -b APEX-123.my-feature -t upstream/devel-3</code><br>Creating a local branch that tracks a remote makes pull easier (no need to specify the remote branch while pulling). A branch can be made to track a remote branch anytime, not necessarily at its creation by:<br><code>git branch -u upstream/devel-3</code></li> +<li>When adding new files, please include the Apache v2.0 license header.<ul> +<li>From the top level directory, run <code>mvn license:check -Dlicense.skip=false</code> to check correct header formatting.</li> +<li>Run <code>mvn license:format -Dlicense.skip=false</code> to automatically add the header when missing.</li> +</ul> +</li> +<li>Once your feature is complete, submit the pull request on github against <code>devel-3</code>.</li> +<li>If you want specific people to review your pull request, use the <code>@</code> notation in Github comments to mention that user, and request that he/she reviews your changes.</li> +<li><p>After all review is complete, combine all new commits into one squashed commit, and include the Jira number in the commit message. There are several ways to squash commits, but <a href="https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits";>here is one explanation from git-scm.com</a> and a simple example is illustrated below:</p> +<p>If tracking upstream/devel-3 then run <code>git rebase -i</code>. Else run <code>git rebase -i upstream/devel-3</code>.<br>This command opens the text editor which lists the multiple commits:</p> +<pre><code>pick 67cd79b change1 +pick 6f98905 change2 + +# Rebase e13748b..3463fbf onto e13748b (2 command(s)) +# +# Commands: +# p, pick = use commit +# r, reword = use commit, but edit the commit message +# e, edit = use commit, but stop for amending +# s, squash = use commit, but meld into previous commit +# f, fixup = like "squash", but discard this commit's log message +# x, exec = run command (the rest of the line) using shell +# +# These lines can be re-ordered; they are executed from top to bottom. +</code></pre><p>Squash 'change2' to 'change1' and save.</p> +<pre><code>pick 67cd79b change1 +squash 6f98905 change2 +</code></pre></li> +<li>Till the review is complete it may happen that working feature branch may diverge from <code>devel-3</code> substantially. Therefore, it is recommended to frequently merge <code>devel-3</code> to the branch being worked on by:<ul> +<li>when the branch tracks upstream/devel-3<br><code>git pull</code></li> +<li>when the branch doesn't track upstream<br><code>git pull upstream devel-3</code></li> +</ul> +</li> +<li>If a pull from <code>devel-3</code> results in a conflict then resolve it and commit the merge. This results in additional merge commits in the pull request. Following steps help to ensure that the final pull request contains just one commit:<ul> +<li>Rename the original branch:<br><code>git branch -m APEX-123.my-feature.squash</code></li> +<li>Create a new branch (with the original name) from upstream/devel-3 that has latest changes:<br><code>git checkout -b APEX-123.my-feature -t upstream/devel-3</code></li> +<li>Squash merge the old branch which was renamed. When the new branch has the latest changes then this squash will result only in the changes that were made for the feature:<br><code>git merge --squash APEX-123.my-feature.squash</code></li> +<li>Commit the squash and force push it to the old feature remote branch so that the pull request is automatically updated:<br><code>git commit -m "APEX-123 #comment added my-feature"</code><br><code>git push origin +APEX-123.my-feature</code></li> +<li>Delete the extra squash branch:<br><code>git branch -D APEX-123.my-feature.squash</code></li> +</ul> +</li> +</ol> +<p>Thanks for contributing!</p> +<h2 id="merging-a-pull-request-committers-">Merging a Pull Request (committers)</h2> +<ol> +<li>Ensure that the basic requirements for a pull request are met. This includes:<ul> +<li>Commit messages need to reference JIRA (pull requests will be linked to ticket)</li> +<li>Travis CI pull request build needs to pass</li> +<li>Ensure tests are added/modified for new features or fixes</li> +<li>Ensure appropriate JavaDoc comments have been added</li> +</ul> +</li> +<li>To set up access to the ASF source repository, <a href="https://git-wip-us.apache.org/#committers-getting-started";>follow these steps</a>. The ASF master repository is: <code>https://git-wip-us.apache.org/repos/asf/incubator-apex-core.git</code></li> +<li>Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the <code>[email protected]</code> mailing list to see the exact commands to merge the given pull request.</li> +<li>Once done with verification, push the changes to the ASF repository's <code>devel-3</code> branch. Within a few<br>seconds, the changes will propagate back to the github mirror and the pull requests be closed and marked merged automatically.</li> +<li>The <code>Fix version</code> field on the corresponding JIRA ticket needs to be set after pushing the changes.</li> +</ol> +<p><strong>Note: since none of us has write access to the mirror, only the author of a pull request can close it if it was not merged.</strong></p> </div> http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/f0fdc916/content/css/main.css ---------------------------------------------------------------------- diff --git a/content/css/main.css b/content/css/main.css index ebb1992..4ca0bf4 100644 --- a/content/css/main.css +++ b/content/css/main.css @@ -1075,7 +1075,7 @@ body { font-size: 14px; line-height: 1.42857143; color: #333333; - background-color: #ffffff; + background-color: #fff; } input, button, @@ -1086,7 +1086,7 @@ textarea { line-height: inherit; } a { - color: #1ea3dd; + color: #1EA3DD; text-decoration: none; } a:hover, @@ -1120,8 +1120,8 @@ img { .img-thumbnail { padding: 4px; line-height: 1.42857143; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; -o-transition: all 0.2s ease-in-out; @@ -1327,7 +1327,7 @@ mark, color: #777777; } .text-primary { - color: #1ea3dd; + color: #1EA3DD; } a.text-primary:hover, a.text-primary:focus { @@ -1363,7 +1363,7 @@ a.text-danger:focus { } .bg-primary { color: #fff; - background-color: #1ea3dd; + background-color: #1EA3DD; } a.bg-primary:hover, a.bg-primary:focus { @@ -1533,8 +1533,8 @@ code { kbd { padding: 2px 4px; font-size: 90%; - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; border-radius: 3px; box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); } @@ -1554,7 +1554,7 @@ pre { word-wrap: break-word; color: #333333; background-color: #f5f5f5; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-radius: 4px; } pre code { @@ -2262,11 +2262,11 @@ th { padding: 8px; line-height: 1.42857143; vertical-align: top; - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .table > thead > tr > th { vertical-align: bottom; - border-bottom: 2px solid #dddddd; + border-bottom: 2px solid #ddd; } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, @@ -2277,10 +2277,10 @@ th { border-top: 0; } .table > tbody + tbody { - border-top: 2px solid #dddddd; + border-top: 2px solid #ddd; } .table .table { - background-color: #ffffff; + background-color: #fff; } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, @@ -2291,7 +2291,7 @@ th { padding: 5px; } .table-bordered { - border: 1px solid #dddddd; + border: 1px solid #ddd; } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, @@ -2299,7 +2299,7 @@ th { .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { - border: 1px solid #dddddd; + border: 1px solid #ddd; } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { @@ -2437,7 +2437,7 @@ table th[class*="col-"] { margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; - border: 1px solid #dddddd; + border: 1px solid #ddd; } .table-responsive > .table { margin-bottom: 0; @@ -2543,9 +2543,9 @@ output { font-size: 14px; line-height: 1.42857143; color: #555555; - background-color: #ffffff; + background-color: #fff; background-image: none; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -2560,14 +2560,14 @@ output { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); } .form-control::-moz-placeholder { - color: #999999; + color: #999; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999999; + color: #999; } .form-control::-webkit-input-placeholder { - color: #999999; + color: #999; } .form-control[disabled], .form-control[readonly], @@ -3018,7 +3018,7 @@ select[multiple].input-lg { .btn:hover, .btn:focus, .btn.focus { - color: #333333; + color: #333; text-decoration: none; } .btn:active, @@ -3042,25 +3042,25 @@ fieldset[disabled] a.btn { pointer-events: none; } .btn-default { - color: #333333; - background-color: #ffffff; - border-color: #cccccc; + color: #333; + background-color: #fff; + border-color: #ccc; } .btn-default:focus, .btn-default.focus { - color: #333333; + color: #333; background-color: #e6e6e6; border-color: #8c8c8c; } .btn-default:hover { - color: #333333; + color: #333; background-color: #e6e6e6; border-color: #adadad; } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { - color: #333333; + color: #333; background-color: #e6e6e6; border-color: #adadad; } @@ -3073,7 +3073,7 @@ fieldset[disabled] a.btn { .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus { - color: #333333; + color: #333; background-color: #d4d4d4; border-color: #8c8c8c; } @@ -3100,33 +3100,33 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #ffffff; - border-color: #cccccc; + background-color: #fff; + border-color: #ccc; } .btn-default .badge { - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; } .btn-primary { - color: #ffffff; - background-color: #1ea3dd; + color: #fff; + background-color: #1EA3DD; border-color: #1b92c7; } .btn-primary:focus, .btn-primary.focus { - color: #ffffff; + color: #fff; background-color: #1882b0; border-color: #0c4056; } .btn-primary:hover { - color: #ffffff; + color: #fff; background-color: #1882b0; border-color: #146b91; } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { - color: #ffffff; + color: #fff; background-color: #1882b0; border-color: #146b91; } @@ -3139,7 +3139,7 @@ fieldset[disabled] .btn-default.active { .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus { - color: #ffffff; + color: #fff; background-color: #146b91; border-color: #0c4056; } @@ -3166,33 +3166,33 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #1ea3dd; + background-color: #1EA3DD; border-color: #1b92c7; } .btn-primary .badge { - color: #1ea3dd; - background-color: #ffffff; + color: #1EA3DD; + background-color: #fff; } .btn-success { - color: #ffffff; + color: #fff; background-color: #5cb85c; border-color: #4cae4c; } .btn-success:focus, .btn-success.focus { - color: #ffffff; + color: #fff; background-color: #449d44; border-color: #255625; } .btn-success:hover { - color: #ffffff; + color: #fff; background-color: #449d44; border-color: #398439; } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { - color: #ffffff; + color: #fff; background-color: #449d44; border-color: #398439; } @@ -3205,7 +3205,7 @@ fieldset[disabled] .btn-primary.active { .btn-success:active.focus, .btn-success.active.focus, .open > .dropdown-toggle.btn-success.focus { - color: #ffffff; + color: #fff; background-color: #398439; border-color: #255625; } @@ -3237,28 +3237,28 @@ fieldset[disabled] .btn-success.active { } .btn-success .badge { color: #5cb85c; - background-color: #ffffff; + background-color: #fff; } .btn-info { - color: #ffffff; + color: #fff; background-color: #5bc0de; border-color: #46b8da; } .btn-info:focus, .btn-info.focus { - color: #ffffff; + color: #fff; background-color: #31b0d5; border-color: #1b6d85; } .btn-info:hover { - color: #ffffff; + color: #fff; background-color: #31b0d5; border-color: #269abc; } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { - color: #ffffff; + color: #fff; background-color: #31b0d5; border-color: #269abc; } @@ -3271,7 +3271,7 @@ fieldset[disabled] .btn-success.active { .btn-info:active.focus, .btn-info.active.focus, .open > .dropdown-toggle.btn-info.focus { - color: #ffffff; + color: #fff; background-color: #269abc; border-color: #1b6d85; } @@ -3303,28 +3303,28 @@ fieldset[disabled] .btn-info.active { } .btn-info .badge { color: #5bc0de; - background-color: #ffffff; + background-color: #fff; } .btn-warning { - color: #ffffff; + color: #fff; background-color: #f0ad4e; border-color: #eea236; } .btn-warning:focus, .btn-warning.focus { - color: #ffffff; + color: #fff; background-color: #ec971f; border-color: #985f0d; } .btn-warning:hover { - color: #ffffff; + color: #fff; background-color: #ec971f; border-color: #d58512; } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { - color: #ffffff; + color: #fff; background-color: #ec971f; border-color: #d58512; } @@ -3337,7 +3337,7 @@ fieldset[disabled] .btn-info.active { .btn-warning:active.focus, .btn-warning.active.focus, .open > .dropdown-toggle.btn-warning.focus { - color: #ffffff; + color: #fff; background-color: #d58512; border-color: #985f0d; } @@ -3369,28 +3369,28 @@ fieldset[disabled] .btn-warning.active { } .btn-warning .badge { color: #f0ad4e; - background-color: #ffffff; + background-color: #fff; } .btn-danger { - color: #ffffff; + color: #fff; background-color: #d9534f; border-color: #d43f3a; } .btn-danger:focus, .btn-danger.focus { - color: #ffffff; + color: #fff; background-color: #c9302c; border-color: #761c19; } .btn-danger:hover { - color: #ffffff; + color: #fff; background-color: #c9302c; border-color: #ac2925; } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { - color: #ffffff; + color: #fff; background-color: #c9302c; border-color: #ac2925; } @@ -3403,7 +3403,7 @@ fieldset[disabled] .btn-warning.active { .btn-danger:active.focus, .btn-danger.active.focus, .open > .dropdown-toggle.btn-danger.focus { - color: #ffffff; + color: #fff; background-color: #ac2925; border-color: #761c19; } @@ -3435,10 +3435,10 @@ fieldset[disabled] .btn-danger.active { } .btn-danger .badge { color: #d9534f; - background-color: #ffffff; + background-color: #fff; } .btn-link { - color: #1ea3dd; + color: #1EA3DD; font-weight: normal; border-radius: 0; } @@ -3566,8 +3566,8 @@ tbody.collapse.in { list-style: none; font-size: 14px; text-align: left; - background-color: #ffffff; - border: 1px solid #cccccc; + background-color: #fff; + border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); @@ -3602,10 +3602,10 @@ tbody.collapse.in { .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { - color: #ffffff; + color: #fff; text-decoration: none; outline: 0; - background-color: #1ea3dd; + background-color: #1EA3DD; } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, @@ -3933,7 +3933,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { color: #555555; text-align: center; background-color: #eeeeee; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-radius: 4px; } .input-group-addon.input-sm { @@ -4034,7 +4034,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav .open > a:hover, .nav .open > a:focus { background-color: #eeeeee; - border-color: #1ea3dd; + border-color: #1EA3DD; } .nav .nav-divider { height: 1px; @@ -4046,7 +4046,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { max-width: none; } .nav-tabs { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } .nav-tabs > li { float: left; @@ -4059,14 +4059,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #eeeeee #eeeeee #ddd; } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #555555; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; } @@ -4101,17 +4101,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border: 1px solid #dddddd; + border: 1px solid #ddd; } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: #ffffff; + border-bottom-color: #fff; } } .nav-pills > li { @@ -4126,8 +4126,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - color: #ffffff; - background-color: #1ea3dd; + color: #fff; + background-color: #1EA3DD; } .nav-stacked > li { float: none; @@ -4169,17 +4169,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border: 1px solid #dddddd; + border: 1px solid #ddd; } @media (min-width: 768px) { .nav-tabs-justified > li > a { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border-bottom-color: #ffffff; + border-bottom-color: #fff; } } .tab-content > .tab-pane { @@ -4524,7 +4524,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-color: #e7e7e7; } .navbar-default .navbar-brand { - color: #777777; + color: #777; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { @@ -4532,37 +4532,37 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: transparent; } .navbar-default .navbar-text { - color: #777777; + color: #777; } .navbar-default .navbar-nav > li > a { - color: #777777; + color: #777; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #333333; + color: #333; background-color: transparent; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #555555; + color: #555; background-color: #e7e7e7; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } .navbar-default .navbar-toggle { - border-color: #dddddd; + border-color: #ddd; } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { - background-color: #dddddd; + background-color: #ddd; } .navbar-default .navbar-toggle .icon-bar { - background-color: #888888; + background-color: #888; } .navbar-default .navbar-collapse, .navbar-default .navbar-form { @@ -4572,51 +4572,51 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #e7e7e7; - color: #555555; + color: #555; } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #777777; + color: #777; } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #333333; + color: #333; background-color: transparent; } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #555555; + color: #555; background-color: #e7e7e7; } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } } .navbar-default .navbar-link { - color: #777777; + color: #777; } .navbar-default .navbar-link:hover { - color: #333333; + color: #333; } .navbar-default .btn-link { - color: #777777; + color: #777; } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #333333; + color: #333; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { - color: #cccccc; + color: #ccc; } .navbar-inverse { - background-color: #222222; + background-color: #222; border-color: #080808; } .navbar-inverse .navbar-brand { @@ -4624,7 +4624,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-inverse .navbar-text { @@ -4635,30 +4635,30 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - color: #ffffff; + color: #fff; background-color: #080808; } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { - color: #444444; + color: #444; background-color: transparent; } .navbar-inverse .navbar-toggle { - border-color: #333333; + border-color: #333; } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #333333; + background-color: #333; } .navbar-inverse .navbar-toggle .icon-bar { - background-color: #ffffff; + background-color: #fff; } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { @@ -4668,7 +4668,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background-color: #080808; - color: #ffffff; + color: #fff; } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { @@ -4682,19 +4682,19 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; + color: #fff; background-color: #080808; } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #444444; + color: #444; background-color: transparent; } } @@ -4702,20 +4702,20 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #9d9d9d; } .navbar-inverse .navbar-link:hover { - color: #ffffff; + color: #fff; } .navbar-inverse .btn-link { color: #9d9d9d; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { - color: #ffffff; + color: #fff; } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { - color: #444444; + color: #444; } .breadcrumb { padding: 8px 15px; @@ -4730,7 +4730,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .breadcrumb > li + li:before { content: "/\00a0"; padding: 0 5px; - color: #cccccc; + color: #ccc; } .breadcrumb > .active { color: #777777; @@ -4751,9 +4751,9 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { padding: 6px 12px; line-height: 1.42857143; text-decoration: none; - color: #1ea3dd; - background-color: #ffffff; - border: 1px solid #dddddd; + color: #1EA3DD; + background-color: #fff; + border: 1px solid #ddd; margin-left: -1px; } .pagination > li:first-child > a, @@ -4774,7 +4774,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { z-index: 3; color: #15719a; background-color: #eeeeee; - border-color: #dddddd; + border-color: #ddd; } .pagination > .active > a, .pagination > .active > span, @@ -4783,9 +4783,9 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; - color: #ffffff; - background-color: #1ea3dd; - border-color: #1ea3dd; + color: #fff; + background-color: #1EA3DD; + border-color: #1EA3DD; cursor: default; } .pagination > .disabled > span, @@ -4795,8 +4795,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { color: #777777; - background-color: #ffffff; - border-color: #dddddd; + background-color: #fff; + border-color: #ddd; cursor: not-allowed; } .pagination-lg > li > a, @@ -4844,8 +4844,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager li > span { display: inline-block; padding: 5px 14px; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-radius: 15px; } .pager li > a:hover, @@ -4866,7 +4866,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:focus, .pager .disabled > span { color: #777777; - background-color: #ffffff; + background-color: #fff; cursor: not-allowed; } .label { @@ -4875,7 +4875,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { font-size: 75%; font-weight: bold; line-height: 1; - color: #ffffff; + color: #fff; text-align: center; white-space: nowrap; vertical-align: baseline; @@ -4883,7 +4883,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } a.label:hover, a.label:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } @@ -4902,7 +4902,7 @@ a.label:focus { background-color: #5e5e5e; } .label-primary { - background-color: #1ea3dd; + background-color: #1EA3DD; } .label-primary[href]:hover, .label-primary[href]:focus { @@ -4942,7 +4942,7 @@ a.label:focus { padding: 3px 7px; font-size: 12px; font-weight: bold; - color: #ffffff; + color: #fff; line-height: 1; vertical-align: middle; white-space: nowrap; @@ -4964,14 +4964,14 @@ a.label:focus { } a.badge:hover, a.badge:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { - color: #1ea3dd; - background-color: #ffffff; + color: #1EA3DD; + background-color: #fff; } .list-group-item > .badge { float: right; @@ -5028,8 +5028,8 @@ a.badge:focus { padding: 4px; margin-bottom: 20px; line-height: 1.42857143; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-radius: 4px; -webkit-transition: border 0.2s ease-in-out; -o-transition: border 0.2s ease-in-out; @@ -5043,7 +5043,7 @@ a.badge:focus { a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { - border-color: #1ea3dd; + border-color: #1EA3DD; } .thumbnail .caption { padding: 9px; @@ -5155,9 +5155,9 @@ a.thumbnail.active { height: 100%; font-size: 12px; line-height: 20px; - color: #ffffff; + color: #fff; text-align: center; - background-color: #1ea3dd; + background-color: #1EA3DD; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width 0.6s ease; @@ -5266,8 +5266,8 @@ a.thumbnail.active { display: block; padding: 10px 15px; margin-bottom: -1px; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; } .list-group-item:first-child { border-top-right-radius: 4px; @@ -5280,18 +5280,18 @@ a.thumbnail.active { } a.list-group-item, button.list-group-item { - color: #555555; + color: #555; } a.list-group-item .list-group-item-heading, button.list-group-item .list-group-item-heading { - color: #333333; + color: #333; } a.list-group-item:hover, button.list-group-item:hover, a.list-group-item:focus, button.list-group-item:focus { text-decoration: none; - color: #555555; + color: #555; background-color: #f5f5f5; } button.list-group-item { @@ -5319,9 +5319,9 @@ button.list-group-item { .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; - color: #ffffff; - background-color: #1ea3dd; - border-color: #1ea3dd; + color: #fff; + background-color: #1EA3DD; + border-color: #1EA3DD; } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, @@ -5465,7 +5465,7 @@ button.list-group-item-danger.active:focus { } .panel { margin-bottom: 20px; - background-color: #ffffff; + background-color: #fff; border: 1px solid transparent; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); @@ -5499,7 +5499,7 @@ button.list-group-item-danger.active:focus { .panel-footer { padding: 10px 15px; background-color: #f5f5f5; - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } @@ -5613,7 +5613,7 @@ button.list-group-item-danger.active:focus { .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { @@ -5690,49 +5690,49 @@ button.list-group-item-danger.active:focus { } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .panel-group .panel-footer { border-top: 0; } .panel-group .panel-footer + .panel-collapse .panel-body { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } .panel-default { - border-color: #dddddd; + border-color: #ddd; } .panel-default > .panel-heading { color: #333333; background-color: #f5f5f5; - border-color: #dddddd; + border-color: #ddd; } .panel-default > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #dddddd; + border-top-color: #ddd; } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #333333; } .panel-default > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #dddddd; + border-bottom-color: #ddd; } .panel-primary { - border-color: #1ea3dd; + border-color: #1EA3DD; } .panel-primary > .panel-heading { - color: #ffffff; - background-color: #1ea3dd; - border-color: #1ea3dd; + color: #fff; + background-color: #1EA3DD; + border-color: #1EA3DD; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #1ea3dd; + border-top-color: #1EA3DD; } .panel-primary > .panel-heading .badge { - color: #1ea3dd; - background-color: #ffffff; + color: #1EA3DD; + background-color: #fff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #1ea3dd; + border-bottom-color: #1EA3DD; } .panel-success { border-color: #d6e9c6; @@ -5859,14 +5859,14 @@ button.list-group-item-danger.active:focus { font-size: 21px; font-weight: bold; line-height: 1; - color: #000000; - text-shadow: 0 1px 0 #ffffff; + color: #000; + text-shadow: 0 1px 0 #fff; opacity: 0.2; filter: alpha(opacity=20); } .close:hover, .close:focus { - color: #000000; + color: #000; text-decoration: none; cursor: pointer; opacity: 0.5; @@ -5921,8 +5921,8 @@ button.close { } .modal-content { position: relative; - background-color: #ffffff; - border: 1px solid #999999; + background-color: #fff; + border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); @@ -5937,7 +5937,7 @@ button.close { bottom: 0; left: 0; z-index: 1040; - background-color: #000000; + background-color: #000; } .modal-backdrop.fade { opacity: 0; @@ -6049,9 +6049,9 @@ button.close { .tooltip-inner { max-width: 200px; padding: 3px 8px; - color: #ffffff; + color: #fff; text-align: center; - background-color: #000000; + background-color: #000; border-radius: 4px; } .tooltip-arrow { @@ -6066,56 +6066,56 @@ button.close { left: 50%; margin-left: -5px; border-width: 5px 5px 0; - border-top-color: #000000; + border-top-color: #000; } .tooltip.top-left .tooltip-arrow { bottom: 0; right: 5px; margin-bottom: -5px; border-width: 5px 5px 0; - border-top-color: #000000; + border-top-color: #000; } .tooltip.top-right .tooltip-arrow { bottom: 0; left: 5px; margin-bottom: -5px; border-width: 5px 5px 0; - border-top-color: #000000; + border-top-color: #000; } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; - border-right-color: #000000; + border-right-color: #000; } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; - border-left-color: #000000; + border-left-color: #000; } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; - border-bottom-color: #000000; + border-bottom-color: #000; } .tooltip.bottom-left .tooltip-arrow { top: 0; right: 5px; margin-top: -5px; border-width: 0 5px 5px; - border-bottom-color: #000000; + border-bottom-color: #000; } .tooltip.bottom-right .tooltip-arrow { top: 0; left: 5px; margin-top: -5px; border-width: 0 5px 5px; - border-bottom-color: #000000; + border-bottom-color: #000; } .popover { position: absolute; @@ -6141,9 +6141,9 @@ button.close { word-spacing: normal; word-wrap: normal; font-size: 14px; - background-color: #ffffff; + background-color: #fff; background-clip: padding-box; - border: 1px solid #cccccc; + border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -6201,7 +6201,7 @@ button.close { bottom: 1px; margin-left: -10px; border-bottom-width: 0; - border-top-color: #ffffff; + border-top-color: #fff; } .popover.right > .arrow { top: 50%; @@ -6216,7 +6216,7 @@ button.close { left: 1px; bottom: -10px; border-left-width: 0; - border-right-color: #ffffff; + border-right-color: #fff; } .popover.bottom > .arrow { left: 50%; @@ -6231,7 +6231,7 @@ button.close { top: 1px; margin-left: -10px; border-top-width: 0; - border-bottom-color: #ffffff; + border-bottom-color: #fff; } .popover.left > .arrow { top: 50%; @@ -6245,7 +6245,7 @@ button.close { content: " "; right: 1px; border-right-width: 0; - border-left-color: #ffffff; + border-left-color: #fff; bottom: -10px; } .carousel { @@ -6339,7 +6339,7 @@ button.close { opacity: 0.5; filter: alpha(opacity=50); font-size: 20px; - color: #ffffff; + color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } @@ -6362,7 +6362,7 @@ button.close { .carousel-control:hover, .carousel-control:focus { outline: 0; - color: #ffffff; + color: #fff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); @@ -6417,7 +6417,7 @@ button.close { height: 10px; margin: 1px; text-indent: -999px; - border: 1px solid #ffffff; + border: 1px solid #fff; border-radius: 10px; cursor: pointer; background-color: #000 \9; @@ -6427,7 +6427,7 @@ button.close { margin: 0; width: 12px; height: 12px; - background-color: #ffffff; + background-color: #fff; } .carousel-caption { position: absolute; @@ -6437,7 +6437,7 @@ button.close { z-index: 10; padding-top: 20px; padding-bottom: 20px; - color: #ffffff; + color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } @@ -6765,7 +6765,7 @@ button.close { } } #main-nav { - background-color: #1ea3dd; + background-color: #1EA3DD; margin-bottom: 0; border: none; } @@ -6836,7 +6836,7 @@ button.close { } .jumbotron { margin-top: -10px; - background-color: #1ea3dd; + background-color: #1EA3DD; color: white; } .jumbotron h1 small { @@ -6856,9 +6856,6 @@ button.close { body { -webkit-font-smoothing: antialiased; } -pre code { - white-space: pre-line; -} /* Colorbrewer theme http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/f0fdc916/content/docs.html ---------------------------------------------------------------------- diff --git a/content/docs.html b/content/docs.html index 93e593a..23d5a9e 100644 --- a/content/docs.html +++ b/content/docs.html @@ -73,16 +73,16 @@ <div class="container"> <h1 id="documentation">Documentation</h1> - <p>New documentation will be coming soon!</p> - <p>Here are a few resources to get started with Apex:</p> - <ul> - <li><a href="https://www.datatorrent.com/docs/guides/ApplicationDeveloperGuide.html";>Application Developer Guide</a></li> - <li><a href="https://www.datatorrent.com/docs/guides/ApplicationPackages.html";>Application Packages Guide</a></li> - <li><a href="https://www.datatorrent.com/docs/guides/OperatorDeveloperGuide.html";>Operator Developer Guide</a></li> - <li><a href="/github-mirror-pull-requests.html">Merging Github Mirror Pull Requests</a></li> - <li><a href="https://www.datatorrent.com/docs/apidocs/";>JavaDoc</a></li> - <li><a href="https://www.datatorrent.com/blog-apex-performance-benchmark/";>Benchmarks compare between 2.0 and 3.0</a></li> - </ul> +<p>New documentation will be coming soon!</p> +<p>Here are a few resources to get started with Apex:</p> +<ul> +<li><a href="https://www.datatorrent.com/docs/guides/ApplicationDeveloperGuide.html";>Application Developer Guide</a></li> +<li><a href="https://www.datatorrent.com/docs/guides/ApplicationPackages.html";>Application Packages Guide</a></li> +<li><a href="https://www.datatorrent.com/docs/guides/OperatorDeveloperGuide.html";>Operator Developer Guide</a></li> +<li><a href="/github-mirror-pull-requests.html">Merging Github Mirror Pull Requests</a></li> +<li><a href="https://www.datatorrent.com/docs/apidocs/";>JavaDoc</a></li> +<li><a href="https://www.datatorrent.com/blog-apex-performance-benchmark/";>Benchmarks compare between 2.0 and 3.0</a></li> +</ul> </div> http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/f0fdc916/content/downloads.html ---------------------------------------------------------------------- diff --git a/content/downloads.html b/content/downloads.html index 4839f1f..b402e1b 100644 --- a/content/downloads.html +++ b/content/downloads.html @@ -120,11 +120,11 @@ <h2 id="third-party-downloads">Third-Party Downloads</h2> - <p>This is a list of 3rd party binary packages based on Apache Apex. The Apache Apex project does not endorse or maintain any 3rd party binary packages.</p> - <ul> - <li><a href="https://www.datatorrent.com/download/";>DataTorrent RTS</a> is a binary build of Apache Apex created by <a href="https://datatorrent.com";>DataTorrent</a>.</li> - </ul> - <p>If you would like to provide your own edition of Apache Apex here, please send email to <a href="mailto:[email protected]";>[email protected]</a>.</p> +<p>This is a list of 3rd party binary packages based on Apache Apex. The Apache Apex project does not endorse or maintain any 3rd party binary packages.</p> +<ul> +<li><a href="https://www.datatorrent.com/download/";>DataTorrent RTS</a> is a binary build of Apache Apex created by <a href="https://datatorrent.com";>DataTorrent</a>.</li> +</ul> +<p>If you would like to provide your own edition of Apache Apex here, please send email to <a href="mailto:[email protected]";>[email protected]</a>.</p> </div> http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/f0fdc916/content/release.html ---------------------------------------------------------------------- diff --git a/content/release.html b/content/release.html index 271254e..4eaf56c 100644 --- a/content/release.html +++ b/content/release.html @@ -73,115 +73,115 @@ <div class="container"> <h1 id="how-to-release-apache-apex-incubating-">How to release Apache Apex (incubating)</h1> - <p>For general information on ASF releases, see:<br><a href="http://incubator.apache.org/guides/releasemanagement.html";>http://incubator.apache.org/guides/releasemanagement.html</a><br><a href="http://www.apache.org/dev/release.html";>http://www.apache.org/dev/release.html</a></p> - <h2 id="creating-release-branch">Creating Release Branch</h2> - <p>If this is a minor release (X.Y.0), start with creating a new branch. Example for 3.2.0:</p> - <pre><code class="lang-bash">git checkout devel-<span class="hljs-number">3</span> && git pull - git checkout -b release-<span class="hljs-number">3.2</span> devel-<span class="hljs-number">3</span> - </code></pre> - <p>Replace version in devel-3 branch:</p> - <pre><code>git checkout devel-<span class="hljs-number">3</span> - git grep <span class="hljs-operator">-l</span> <span class="hljs-string">"3.2.0-incubating-SNAPSHOT"</span> - </code></pre><p>For informational purpose, this should yield the list of files that needs the version number replaced to X.(Y+1).0 next version. Note that the replacement step is different between the repositories due to an open issue. See:</p> - <p><a href="https://malhar.atlassian.net/browse/APEX-34";>https://malhar.atlassian.net/browse/APEX-34</a></p> - <p>For -core: </p> - <pre><code class="lang-bash">dv=<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-SNAPSHOT - rv=<span class="hljs-number">3.3</span>.<span class="hljs-number">0</span>-incubating-SNAPSHOT - <span class="hljs-keyword">for</span> a <span class="hljs-keyword">in</span> `git grep -l <span class="hljs-string">"${dv}"</span>`; do echo <span class="hljs-variable">$a</span>; sed -i <span class="hljs-string">'s/'</span><span class="hljs-string">"${dv}"</span><span class="hljs-string">'/'</span><span class="hljs-string">"${rv}"</span><span class="hljs-string">'/g'</span> <span class="hljs-variable">$a</span>; done - </code></pre> - <p>For -malhar:</p> - <pre><code>mvn versions:<span class="hljs-built_in">set</span> -DnewVersion=<span class="hljs-variable">${rv}</span> - </code></pre><p>Commit and push the change:</p> - <pre><code>git <span class="hljs-operator"><span class="hljs-keyword">commit</span> -<span class="hljs-keyword">m</span> <span class="hljs-string">"Preparing for 3.3.0 development"</span> - git push apache devel-<span class="hljs-number">3</span></span> - </code></pre><h2 id="preparing-release-candidate">Preparing Release Candidate</h2> - <h3 id="add-missing-since-tags">Add missing @since tags</h3> - <p>For Java classes added since the last release, the @since tags need to be added. The javadoc plugin inserts missing tags, but does not play well with the license header when no class level documentation block is present. This is tracked as</p> - <p><a href="https://malhar.atlassian.net/browse/APEX-183";>https://malhar.atlassian.net/browse/APEX-183</a></p> - <p>It also removes the custom @tags doclet tag when the existing JavaDoc is malformed, <strong>do not use this to make changes in Malhar</strong>. Until these problems are resolved, following (convoluted) procedure can be used <strong>only for -core</strong> to get the work done. </p> - <p>Find the files that need to be modified:</p> - <pre><code>yes | mvn javadoc:fix -DdefaultSince=<span class="hljs-number">3.2</span><span class="hljs-number">.0</span> -DfixTags=since -DignoreClirr=<span class="hljs-literal">true</span> -DfixFieldComment=<span class="hljs-literal">false</span> -DfixMethodComment=<span class="hljs-literal">false</span> - </code></pre><p>The tags were inserted in the wrong place, remove the leading blank line added in previous step and replace <code>/**</code> with <code>/*</code> for affected files:</p> - <pre><code><span class="hljs-title">git</span> status -s | awk <span class="hljs-string">'{print <span class="hljs-variable">$2</span>}'</span> | xargs sed -i <span class="hljs-string">':a;N;$!ba;s!^\n/\*\*!/*!'</span> - </code></pre><p>Now repeat and insert tags in correct place:</p> - <pre><code>yes | mvn javadoc:fix -DdefaultSince=<span class="hljs-number">3.2</span><span class="hljs-number">.0</span> -DfixTags=since -DignoreClirr=<span class="hljs-literal">true</span> -DfixFieldComment=<span class="hljs-literal">false</span> -DfixMethodComment=<span class="hljs-literal">false</span> - </code></pre><p>Finally restore license headers to what they used to be:</p> - <pre><code><span class="hljs-keyword">mvn </span>license:format -Dlicense<span class="hljs-preprocessor">.skip</span><span class="hljs-label">=false</span> - </code></pre><p>Do a git diff to double check, if all looks good commit and create pull request</p> - <h3 id="update-changelog-from-jira">Update CHANGELOG from JIRA</h3> - <p>Navigate to the unreleased version, example for 3.2.0:</p> - <p><a href="https://malhar.atlassian.net/projects/APEX/versions/11700";>https://malhar.atlassian.net/projects/APEX/versions/11700</a></p> - <p>Obtain the release notes (text mode):</p> - <p><a href="https://malhar.atlassian.net/secure/ReleaseNote.jspa?version=11700&styleName=Text&projectId=10700";>https://malhar.atlassian.net/secure/ReleaseNote.jspa?version=11700&styleName=Text&projectId=10700</a></p> - <p>Shorten any wrapping and overly long titles to fit width. Copy the report and insert new release section into <code>CHANGELOG.md</code> with the release date set to 72 hours ahead to reflect the time for the vote.</p> - <p>Create shortlink for the JIRA release notes on <a href="http://s.apache.org/";>http://s.apache.org/</a> for use in the VOTE thread.<br>Example: <a href="http://s.apache.org/SRM";>http://s.apache.org/SRM</a></p> - <p>Commit tags and change log:</p> - <pre><code><span class="hljs-title">git</span> commit -am <span class="hljs-string">"Add <span class="hljs-variable">@since</span> tags and update change log for release 3.2.0"</span> - </code></pre><h3 id="update-version-number-for-rc">Update version number for RC</h3> - <pre><code>dv=<span class="hljs-number">3.2</span><span class="hljs-number">.0</span>-incubating-SNAPSHOT - rv=<span class="hljs-number">3.2</span><span class="hljs-number">.0</span>-incubating - </code></pre><p>As mentioned earlier, use the following for -core releases:</p> - <pre><code><span class="hljs-keyword">for</span> a <span class="hljs-keyword">in</span> `git grep -l <span class="hljs-string">"${dv}"</span>`; do echo <span class="hljs-variable">$a</span>; sed -i <span class="hljs-string">'s/'</span><span class="hljs-string">"${dv}"</span><span class="hljs-string">'/'</span><span class="hljs-string">"${rv}"</span><span class="hljs-string">'/g'</span> <span class="hljs-variable">$a</span>; done - </code></pre><p>And this for -malhar releases:</p> - <pre><code>mvn versions:<span class="hljs-built_in">set</span> -Pall-modules -DnewVersion=<span class="hljs-variable">${rv}</span> - </code></pre><p>Commit version change:</p> - <pre><code>git commit -am <span class="hljs-string">"Preparing to release <span class="hljs-variable">${rv}</span>-RC1"</span> - git tag <span class="hljs-operator">-a</span> <span class="hljs-string">"v<span class="hljs-variable">${rv}</span>-RC1"</span> -m <span class="hljs-string">"Release <span class="hljs-variable">${rv}</span>-RC1"</span> - </code></pre><p>Push to fork, open pull request, wait for Travis CI build to succeed. Then push the tag.</p> - <pre><code>git <span class="hljs-keyword">push</span> apache <span class="hljs-string">"v<span class="hljs-subst">${rv}</span>-RC1"</span> - </code></pre><p>The only difference between branch and the tag is this final version number change. The branch stays at <code>SNAPSHOT</code> version.</p> - <h2 id="build-and-deploy-release-candidate">Build and Deploy Release Candidate</h2> - <p>Prerequisites:</p> - <ul> - <li>GPG key needs to be in <a href="https://dist.apache.org/repos/dist/release/incubator/apex/KEYS";>https://dist.apache.org/repos/dist/release/incubator/apex/KEYS</a></li> - <li>Credentials for distribution management in <code>~/.m2/settings.xml</code></li> - <li>Tag pushed to ASF git</li> - </ul> - <p>Build and deploy release candidate from RC tag:</p> - <pre><code>git checkout <span class="hljs-string">"v<span class="hljs-variable">${rv}</span>-RC1"</span> - git clean <span class="hljs-operator">-d</span> <span class="hljs-operator">-f</span> - mvn clean deploy -Papache-release -DskipTests -Dsonatype_user=<user> - </code></pre><p>Log on to <a href="https://repository.apache.org";>https://repository.apache.org</a> and look for Staging Repositories. "Close" the newly created orgapacheapex-xxxx staging repository to obtain the temporary URL, note it down for the VOTE thread.</p> - <p>Example URL: <a href="https://repository.apache.org/content/repositories/orgapacheapex-1000/";>https://repository.apache.org/content/repositories/orgapacheapex-1000/</a></p> - <p>Copy files to distribution dir and create checksums</p> - <pre><code class="lang-bash">md5sum apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.tar</span><span class="hljs-class">.gz</span> > apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.tar</span><span class="hljs-class">.gz</span><span class="hljs-class">.md5</span> - md5sum apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.zip</span> > apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.zip</span><span class="hljs-class">.md5</span> - - shasum -<span class="hljs-tag">a</span> <span class="hljs-number">512</span> apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.tar</span><span class="hljs-class">.gz</span> > apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.tar</span><span class="hljs-class">.gz</span><span class="hljs-class">.sha</span> - shasum -<span class="hljs-tag">a</span> <span class="hljs-number">512</span> apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.zip</span> > apex-<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-source-release<span class="hljs-class">.zip</span><span class="hljs-class">.sha</span> - - svn co https:<span class="hljs-comment">//dist.apache.org/repos/dist/dev/incubator/apex</span> - </code></pre> - <p>create directory for new version<br>svn add the source archives and signature/checksum files</p> - <pre><code class="lang-bash">svn <span class="hljs-operator"><span class="hljs-keyword">commit</span> -<span class="hljs-keyword">m</span> <span class="hljs-string">"Apache Apex v3.2.0-incubating-RC2"</span></span> - </code></pre> - <h2 id="voting">Voting</h2> - <p>PPMC vote call:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/browser";>http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/browser</a></p> - <p>PPMC vote result:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/%3CCAKJfLDOY-SpcJfdFiJosoyZ2JidursecietvhT5AgUeX-%3Dw-Tw%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/%3CCAKJfLDOY-SpcJfdFiJosoyZ2JidursecietvhT5AgUeX-%3Dw-Tw%40mail.gmail.com%3E</a></p> - <p>Once PPMC vote passes, another vote needs to be called for IPMC (only IPMC votes are binding).</p> - <p>IPMC vote call:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo21vEVw5eggLmmbx4pxwkXNLysTXYa4_hyMbWnpUZSpyQ%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo21vEVw5eggLmmbx4pxwkXNLysTXYa4_hyMbWnpUZSpyQ%40mail.gmail.com%3E</a></p> - <p>IPMC vote result:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo2O8aqg3Z0-y0hiyq5aFskYrMDG-xYbdfQR8YGCiiGAjA%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo2O8aqg3Z0-y0hiyq5aFskYrMDG-xYbdfQR8YGCiiGAjA%40mail.gmail.com%3E</a></p> - <p>If the vote is not successful, a new RC needs to be built. Once IPMC vote passes, proceed with promoting and announcing the release.</p> - <h2 id="promote-release">Promote Release</h2> - <p>Release Nexus staging repository: <a href="http://central.sonatype.org/pages/releasing-the-deployment.html#close-and-drop-or-release-your-staging-repository";>http://central.sonatype.org/pages/releasing-the-deployment.html#close-and-drop-or-release-your-staging-repository</a></p> - <p>Move source release to dist folder: svn mv <a href="https://dist.apache.org/repos/dist/dev/incubator/apex/v3.2.0-incubating-RC2";>https://dist.apache.org/repos/dist/dev/incubator/apex/v3.2.0-incubating-RC2</a> <a href="https://dist.apache.org/repos/dist/release/incubator/apex/v3.2.0-incubating";>https://dist.apache.org/repos/dist/release/incubator/apex/v3.2.0-incubating</a></p> - <h3 id="jira">JIRA</h3> - <p>Close release and all associated tickets<br>Create version numbers for next release</p> - <h3 id="git">git</h3> - <p>Create final release tag:</p> - <pre><code class="lang-bash"><span class="hljs-tag">git</span> <span class="hljs-tag">tag</span> <span class="hljs-tag">-a</span> "<span class="hljs-tag">v3</span><span class="hljs-class">.2</span><span class="hljs-class">.0-incubating</span>" <span class="hljs-tag">-m</span> "<span class="hljs-tag">Release</span> 3<span class="hljs-class">.2</span><span class="hljs-class">.0-incubating</span>" "<span class="hljs-tag">v3</span><span class="hljs-class">.2</span><span class="hljs-class">.0-incubating-RC2</span>" - <span class="hljs-tag">git</span> <span class="hljs-tag">push</span> <span class="hljs-tag">apache</span> "<span class="hljs-tag">v3</span><span class="hljs-class">.2</span><span class="hljs-class">.0-incubating</span>" - </code></pre> - <p>Bump patch version number in release branch (X.Y.Z+1 - otherwise same as when creating new release branch):</p> - <pre><code class="lang-bash">git checkout release-<span class="hljs-number">3.2</span> - dv=<span class="hljs-number">3.2</span>.<span class="hljs-number">0</span>-incubating-SNAPSHOT - rv=<span class="hljs-number">3.2</span>.<span class="hljs-number">1</span>-incubating-SNAPSHOT - <span class="hljs-keyword">for</span> a <span class="hljs-keyword">in</span> `git grep -l <span class="hljs-string">"${dv}"</span>`; do echo <span class="hljs-variable">$a</span>; sed -i <span class="hljs-string">'s/'</span><span class="hljs-string">"${dv}"</span><span class="hljs-string">'/'</span><span class="hljs-string">"${rv}"</span><span class="hljs-string">'/g'</span> <span class="hljs-variable">$a</span>; done - git commit -am <span class="hljs-string">"Preparing for 3.2.1 development"</span> - </code></pre> - <p>Merge <code>@since</code> tag and change log changes to <code>devel-3</code></p> - <h2 id="announce-release">Announce Release</h2> - <p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201511.mbox/%3CCA%2B5xAo1mS-BMT%3DXk_q287_j5m6ngtaT8QEEED0zfQhXtgrnOtA%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-general/201511.mbox/%3CCA%2B5xAo1mS-BMT%3DXk_q287_j5m6ngtaT8QEEED0zfQhXtgrnOtA%40mail.gmail.com%3E</a></p> +<p>For general information on ASF releases, see:<br><a href="http://incubator.apache.org/guides/releasemanagement.html";>http://incubator.apache.org/guides/releasemanagement.html</a><br><a href="http://www.apache.org/dev/release.html";>http://www.apache.org/dev/release.html</a></p> +<h2 id="creating-release-branch">Creating Release Branch</h2> +<p>If this is a minor release (X.Y.0), start with creating a new branch. Example for 3.2.0:</p> +<pre><code class="lang-bash">git checkout devel-3 && git pull +git checkout -b release-3.2 devel-3 +</code></pre> +<p>Replace version in devel-3 branch:</p> +<pre><code>git checkout devel-3 +git grep -l "3.2.0-incubating-SNAPSHOT" +</code></pre><p>For informational purpose, this should yield the list of files that needs the version number replaced to X.(Y+1).0 next version. Note that the replacement step is different between the repositories due to an open issue. See:</p> +<p><a href="https://malhar.atlassian.net/browse/APEX-34";>https://malhar.atlassian.net/browse/APEX-34</a></p> +<p>For -core: </p> +<pre><code class="lang-bash">dv=3.2.0-incubating-SNAPSHOT +rv=3.3.0-incubating-SNAPSHOT +for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done +</code></pre> +<p>For -malhar:</p> +<pre><code>mvn versions:set -DnewVersion=${rv} +</code></pre><p>Commit and push the change:</p> +<pre><code>git commit -m "Preparing for 3.3.0 development" +git push apache devel-3 +</code></pre><h2 id="preparing-release-candidate">Preparing Release Candidate</h2> +<h3 id="add-missing-since-tags">Add missing @since tags</h3> +<p>For Java classes added since the last release, the @since tags need to be added. The javadoc plugin inserts missing tags, but does not play well with the license header when no class level documentation block is present. This is tracked as</p> +<p><a href="https://malhar.atlassian.net/browse/APEX-183";>https://malhar.atlassian.net/browse/APEX-183</a></p> +<p>It also removes the custom @tags doclet tag when the existing JavaDoc is malformed, <strong>do not use this to make changes in Malhar</strong>. Until these problems are resolved, following (convoluted) procedure can be used <strong>only for -core</strong> to get the work done. </p> +<p>Find the files that need to be modified:</p> +<pre><code>yes | mvn javadoc:fix -DdefaultSince=3.2.0 -DfixTags=since -DignoreClirr=true -DfixFieldComment=false -DfixMethodComment=false +</code></pre><p>The tags were inserted in the wrong place, remove the leading blank line added in previous step and replace <code>/**</code> with <code>/*</code> for affected files:</p> +<pre><code>git status -s | awk '{print $2}' | xargs sed -i ':a;N;$!ba;s!^\n/\*\*!/*!' +</code></pre><p>Now repeat and insert tags in correct place:</p> +<pre><code>yes | mvn javadoc:fix -DdefaultSince=3.2.0 -DfixTags=since -DignoreClirr=true -DfixFieldComment=false -DfixMethodComment=false +</code></pre><p>Finally restore license headers to what they used to be:</p> +<pre><code>mvn license:format -Dlicense.skip=false +</code></pre><p>Do a git diff to double check, if all looks good commit and create pull request</p> +<h3 id="update-changelog-from-jira">Update CHANGELOG from JIRA</h3> +<p>Navigate to the unreleased version, example for 3.2.0:</p> +<p><a href="https://malhar.atlassian.net/projects/APEX/versions/11700";>https://malhar.atlassian.net/projects/APEX/versions/11700</a></p> +<p>Obtain the release notes (text mode):</p> +<p><a href="https://malhar.atlassian.net/secure/ReleaseNote.jspa?version=11700&styleName=Text&projectId=10700";>https://malhar.atlassian.net/secure/ReleaseNote.jspa?version=11700&styleName=Text&projectId=10700</a></p> +<p>Shorten any wrapping and overly long titles to fit width. Copy the report and insert new release section into <code>CHANGELOG.md</code> with the release date set to 72 hours ahead to reflect the time for the vote.</p> +<p>Create shortlink for the JIRA release notes on <a href="http://s.apache.org/";>http://s.apache.org/</a> for use in the VOTE thread.<br>Example: <a href="http://s.apache.org/SRM";>http://s.apache.org/SRM</a></p> +<p>Commit tags and change log:</p> +<pre><code>git commit -am "Add @since tags and update change log for release 3.2.0" +</code></pre><h3 id="update-version-number-for-rc">Update version number for RC</h3> +<pre><code>dv=3.2.0-incubating-SNAPSHOT +rv=3.2.0-incubating +</code></pre><p>As mentioned earlier, use the following for -core releases:</p> +<pre><code>for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done +</code></pre><p>And this for -malhar releases:</p> +<pre><code>mvn versions:set -Pall-modules -DnewVersion=${rv} +</code></pre><p>Commit version change:</p> +<pre><code>git commit -am "Preparing to release ${rv}-RC1" +git tag -a "v${rv}-RC1" -m "Release ${rv}-RC1" +</code></pre><p>Push to fork, open pull request, wait for Travis CI build to succeed. Then push the tag.</p> +<pre><code>git push apache "v${rv}-RC1" +</code></pre><p>The only difference between branch and the tag is this final version number change. The branch stays at <code>SNAPSHOT</code> version.</p> +<h2 id="build-and-deploy-release-candidate">Build and Deploy Release Candidate</h2> +<p>Prerequisites:</p> +<ul> +<li>GPG key needs to be in <a href="https://dist.apache.org/repos/dist/release/incubator/apex/KEYS";>https://dist.apache.org/repos/dist/release/incubator/apex/KEYS</a></li> +<li>Credentials for distribution management in <code>~/.m2/settings.xml</code></li> +<li>Tag pushed to ASF git</li> +</ul> +<p>Build and deploy release candidate from RC tag:</p> +<pre><code>git checkout "v${rv}-RC1" +git clean -d -f +mvn clean deploy -Papache-release -DskipTests -Dsonatype_user=<user> +</code></pre><p>Log on to <a href="https://repository.apache.org";>https://repository.apache.org</a> and look for Staging Repositories. "Close" the newly created orgapacheapex-xxxx staging repository to obtain the temporary URL, note it down for the VOTE thread.</p> +<p>Example URL: <a href="https://repository.apache.org/content/repositories/orgapacheapex-1000/";>https://repository.apache.org/content/repositories/orgapacheapex-1000/</a></p> +<p>Copy files to distribution dir and create checksums</p> +<pre><code class="lang-bash">md5sum apex-3.2.0-incubating-source-release.tar.gz > apex-3.2.0-incubating-source-release.tar.gz.md5 +md5sum apex-3.2.0-incubating-source-release.zip > apex-3.2.0-incubating-source-release.zip.md5 + +shasum -a 512 apex-3.2.0-incubating-source-release.tar.gz > apex-3.2.0-incubating-source-release.tar.gz.sha +shasum -a 512 apex-3.2.0-incubating-source-release.zip > apex-3.2.0-incubating-source-release.zip.sha + +svn co https://dist.apache.org/repos/dist/dev/incubator/apex +</code></pre> +<p>create directory for new version<br>svn add the source archives and signature/checksum files</p> +<pre><code class="lang-bash">svn commit -m "Apache Apex v3.2.0-incubating-RC2" +</code></pre> +<h2 id="voting">Voting</h2> +<p>PPMC vote call:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/browser";>http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/browser</a></p> +<p>PPMC vote result:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/%3CCAKJfLDOY-SpcJfdFiJosoyZ2JidursecietvhT5AgUeX-%3Dw-Tw%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201510.mbox/%3CCAKJfLDOY-SpcJfdFiJosoyZ2JidursecietvhT5AgUeX-%3Dw-Tw%40mail.gmail.com%3E</a></p> +<p>Once PPMC vote passes, another vote needs to be called for IPMC (only IPMC votes are binding).</p> +<p>IPMC vote call:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo21vEVw5eggLmmbx4pxwkXNLysTXYa4_hyMbWnpUZSpyQ%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo21vEVw5eggLmmbx4pxwkXNLysTXYa4_hyMbWnpUZSpyQ%40mail.gmail.com%3E</a></p> +<p>IPMC vote result:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo2O8aqg3Z0-y0hiyq5aFskYrMDG-xYbdfQR8YGCiiGAjA%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-general/201510.mbox/%3CCA%2B5xAo2O8aqg3Z0-y0hiyq5aFskYrMDG-xYbdfQR8YGCiiGAjA%40mail.gmail.com%3E</a></p> +<p>If the vote is not successful, a new RC needs to be built. Once IPMC vote passes, proceed with promoting and announcing the release.</p> +<h2 id="promote-release">Promote Release</h2> +<p>Release Nexus staging repository: <a href="http://central.sonatype.org/pages/releasing-the-deployment.html#close-and-drop-or-release-your-staging-repository";>http://central.sonatype.org/pages/releasing-the-deployment.html#close-and-drop-or-release-your-staging-repository</a></p> +<p>Move source release to dist folder: svn mv <a href="https://dist.apache.org/repos/dist/dev/incubator/apex/v3.2.0-incubating-RC2";>https://dist.apache.org/repos/dist/dev/incubator/apex/v3.2.0-incubating-RC2</a> <a href="https://dist.apache.org/repos/dist/release/incubator/apex/v3.2.0-incubating";>https://dist.apache.org/repos/dist/release/incubator/apex/v3.2.0-incubating</a></p> +<h3 id="jira">JIRA</h3> +<p>Close release and all associated tickets<br>Create version numbers for next release</p> +<h3 id="git">git</h3> +<p>Create final release tag:</p> +<pre><code class="lang-bash">git tag -a "v3.2.0-incubating" -m "Release 3.2.0-incubating" "v3.2.0-incubating-RC2" +git push apache "v3.2.0-incubating" +</code></pre> +<p>Bump patch version number in release branch (X.Y.Z+1 - otherwise same as when creating new release branch):</p> +<pre><code class="lang-bash">git checkout release-3.2 +dv=3.2.0-incubating-SNAPSHOT +rv=3.2.1-incubating-SNAPSHOT +for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done +git commit -am "Preparing for 3.2.1 development" +</code></pre> +<p>Merge <code>@since</code> tag and change log changes to <code>devel-3</code></p> +<h2 id="announce-release">Announce Release</h2> +<p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201511.mbox/%3CCA%2B5xAo1mS-BMT%3DXk_q287_j5m6ngtaT8QEEED0zfQhXtgrnOtA%40mail.gmail.com%3E";>http://mail-archives.apache.org/mod_mbox/incubator-general/201511.mbox/%3CCA%2B5xAo1mS-BMT%3DXk_q287_j5m6ngtaT8QEEED0zfQhXtgrnOtA%40mail.gmail.com%3E</a></p> </div>
