You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by sa...@apache.org on 2016/01/20 01:09:28 UTC
[1/2] incubator-apex-site git commit: from
25ca7edfb9f6f7e747517a5e472248aa7c136a21
Repository: incubator-apex-site
Updated Branches:
refs/heads/asf-site 4afa94023 -> 5cc5230d8
from 25ca7edfb9f6f7e747517a5e472248aa7c136a21
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/d12444d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/d12444d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/d12444d9
Branch: refs/heads/asf-site
Commit: d12444d963e84961980c176b777145f8dd8024aa
Parents: 0afa1b0
Author: sashadt <sa...@datatorrent.com>
Authored: Tue Jan 19 16:09:20 2016 -0800
Committer: sashadt <sa...@datatorrent.com>
Committed: Tue Jan 19 16:09:20 2016 -0800
----------------------------------------------------------------------
content/contributing.html | 2 +-
content/docs.html | 2 +-
content/downloads.html | 29 +++++++++++++++++++++++++++++
content/release.html | 34 ++++++++++++----------------------
4 files changed, 43 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/d12444d9/content/contributing.html
----------------------------------------------------------------------
diff --git a/content/contributing.html b/content/contributing.html
index 35d0118..bcde403 100644
--- a/content/contributing.html
+++ b/content/contributing.html
@@ -172,7 +172,7 @@ squash 6f98905 change2
<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>dev@apex.incubator.apache.org</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>
+<li>The <code>Fix version</code> field on the corresponding JIRA ticket needs to be set and the ticket resolved 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>
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/d12444d9/content/docs.html
----------------------------------------------------------------------
diff --git a/content/docs.html b/content/docs.html
index bf08595..511dae4 100644
--- a/content/docs.html
+++ b/content/docs.html
@@ -88,7 +88,7 @@
<li><a href="http://docs.datatorrent.com/application_development/">Application Developer Guide</a></li>
<li><a href="http://docs.datatorrent.com/application_packages/">Application Packages Guide</a></li>
<li><a href="http://docs.datatorrent.com/operator_development/">Operator Developer Guide</a></li>
-<li><a href="/github-mirror-pull-requests.html">Merging Github Mirror Pull Requests</a></li>
+<li><a href="/contributing.html">Contributing Guidelines</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>
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/d12444d9/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index 7118825..12940af 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -135,6 +135,35 @@
<tbody>
<tr>
<td>
+ 3.3.0-incubating
+ <span class="latest-tag">(latest)</span>
+ </td>
+ <td>
+ 2016-1-17
+ </td>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.lua/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.zip">malhar-3.3.0-incubating-source-release.zip</a><br>
+ <small>
+ (
+ <a href="https://dist.apache.org/repos/dist/release/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.zip.asc">pgp</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.zip.md5">md5</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.zip.sha">sha1</a>
+ )
+ </small>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dyn/closer.lua/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.tar.gz">malhar-3.3.0-incubating-source-release.tar.gz</a><br>
+ <small>
+ (
+ <a href="https://dist.apache.org/repos/dist/release/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.tar.gz.asc">pgp</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.tar.gz.md5">md5</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/apex/malhar/v3.3.0-incubating/malhar-3.3.0-incubating-source-release.tar.gz.sha">sha1</a>
+ )
+ </small>
+ </td>
+ </tr>
+ <tr>
+ <td>
3.2.0-incubating
<span class="latest-tag">(latest)</span>
</td>
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/d12444d9/content/release.html
----------------------------------------------------------------------
diff --git a/content/release.html b/content/release.html
index 5d16152..9528a99 100644
--- a/content/release.html
+++ b/content/release.html
@@ -86,38 +86,29 @@ git checkout -b release-3.2 devel-3
<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><a href="https://issues.apache.org/jira/browse/APEXCORE-34">https://issues.apache.org/jira/browse/APEXCORE-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}
+<pre><code>mvn versions:set -DnewVersion=${rv} -Pall-modules
</code></pre><p>Commit and push the change:</p>
-<pre><code>git commit -m "Preparing for 3.3.0 development"
+<pre><code>git commit -am "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>
+<p><a href="https://issues.apache.org/jira/browse/APEXCORE-183">https://issues.apache.org/jira/browse/APEXCORE-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, use the following Ruby script to do the replacement: <a href="https://issues.apache.org/jira/secure/attachment/12781158/add-since.rb">https://issues.apache.org/jira/secure/attachment/12781158/add-since.rb</a></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>Navigate to the unreleased version, example:</p>
+<p><a href="https://issues.apache.org/jira/browse/APEXMALHAR/fixforversion/12334589">https://issues.apache.org/jira/browse/APEXMALHAR/fixforversion/12334589</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><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12334589&styleName=Text&projectId=12318824">https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12334589&styleName=Text&projectId=12318824</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>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/8uT">http://s.apache.org/8uT</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>
@@ -126,7 +117,7 @@ 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}
+<pre><code>mvn versions:set -Pall-modules -DnewVersion=${rv} -Pall-modules
</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"
@@ -164,12 +155,11 @@ gpg --armor --output malhar-${rv}-source-release.tar.gz.asc --detach-sig malhar
gpg --armor --output malhar-${rv}-source-release.zip.asc --detach-sig malhar-${rv}-source-release.zip
</code></pre>
<p>Check files into the dist staging area:</p>
-<pre><code class="lang-bash">mkdir svn-dist
-cp ../*-source-* svn-dist/
+<pre><code class="lang-bash">mkdir svn-dist && cp *-source-* svn-dist/
svn import svn-dist https://dist.apache.org/repos/dist/dev/incubator/apex/v${rv}-RC1 -m "Apache Apex v${rv}-RC1"
</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 call sample:<br><a href="http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201601.mbox/%3CCAKJfLDOj58dtfWTw2oBfm5GsyZqsbWCYFSCro9U%2BJw2%2BTFbVpQ%40mail.gmail.com%3E">http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/201601.mbox/%3CCAKJfLDOj58dtfWTw2oBfm5GsyZqsbWCYFSCro9U%2BJw2%2BTFbVpQ%40mail.gmail.com%3E</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>
[2/2] incubator-apex-site git commit: Merge branch 'asf-site' of
https://git-wip-us.apache.org/repos/asf/incubator-apex-site into asf-site
Posted by sa...@apache.org.
Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/incubator-apex-site into asf-site
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/5cc5230d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/5cc5230d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/5cc5230d
Branch: refs/heads/asf-site
Commit: 5cc5230d8207c9cfc7403cbc7ea21727c3350e33
Parents: d12444d 4afa940
Author: sashadt <sa...@datatorrent.com>
Authored: Tue Jan 19 16:09:23 2016 -0800
Committer: sashadt <sa...@datatorrent.com>
Committed: Tue Jan 19 16:09:23 2016 -0800
----------------------------------------------------------------------
content/css/main.css | 396 +++++++++++++++++++++++-----------------------
1 file changed, 198 insertions(+), 198 deletions(-)
----------------------------------------------------------------------