You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/08/10 08:59:45 UTC
flink-web git commit: [FLINK-2365] Improves How to contribute page
Repository: flink-web
Updated Branches:
refs/heads/asf-site 498fef0c5 -> 1f917e3b4
[FLINK-2365] Improves How to contribute page
- Fixes typos, broken links
- Improves formatting
- Adds reference to the website's GitHub mirror repo
Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/1f917e3b
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/1f917e3b
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/1f917e3b
Branch: refs/heads/asf-site
Commit: 1f917e3b40fc74431e06834826cc556e4e78c48b
Parents: 498fef0
Author: Enrique Bautista <eb...@gmail.com>
Authored: Thu Jul 16 00:22:32 2015 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Mon Aug 10 08:59:25 2015 +0200
----------------------------------------------------------------------
content/how-to-contribute.html | 120 +++++++++++++++++++-----------------
how-to-contribute.md | 84 +++++++++++++------------
2 files changed, 107 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink-web/blob/1f917e3b/content/how-to-contribute.html
----------------------------------------------------------------------
diff --git a/content/how-to-contribute.html b/content/how-to-contribute.html
index 9bfb253..5e714bb 100644
--- a/content/how-to-contribute.html
+++ b/content/how-to-contribute.html
@@ -143,7 +143,7 @@
<div class="col-sm-12"><h1>How To Contribute</h1></div>
</div>
-<p>The Flink project welcomes all sorts contributions in the form of code (improvements, features, bugfixes), documentation, tests, and community participation (discussions & questions).</p>
+<p>The Flink project welcomes all sort of contributions in the form of code (improvements, features, bugfixes), tests, documentation, and community participation (discussions & questions).</p>
<div class="page-toc">
<ul id="markdown-toc">
@@ -169,7 +169,7 @@
<h2 id="easy-issues-for-starters">Easy Issues for Starters</h2>
-<p>We maintain all known issues and feature drafts in the <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+FLINK">Flink project JIRA</a>.</p>
+<p>We maintain all known issues and feature drafts in the <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+FLINK">Flink JIRA project</a>.</p>
<p>We also try to maintain a <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20FLINK%20AND%20resolution%20%3D%20Unresolved%20AND%20labels%20%3D%20starter%20ORDER%20BY%20priority%20DESC">list of simple “starter issues”</a> that we believe are good tasks for new contributors. Those tasks are meant to allow people to get into the project and become familiar with the process of contributing. Feel free to ask questions about issues that you would be interested in working on.</p>
@@ -179,7 +179,7 @@
<p>This section gives you a brief introduction in how to contribute code and documentation to Flink. We maintain both the code and the documentation in the same repository, so the process is essentially the same for both. We use <a href="http://git-scm.com/">git</a> for the code and documentation version control. The documentation is located in the <code>docs/</code> subdirectory of the git repository.</p>
-<p>The Flink project accepts code contributions though the <a href="https://github.com/apache/flink">GitHub Mirror</a>, in the form of <a href="https://help.github.com/articles/using-pull-requests">Pull Requests</a>. Pull requests are basically a simpler way of offering a patch, by providing a pointer to a code branch that contains the change.</p>
+<p>The Flink project accepts code contributions through the <a href="https://github.com/apache/flink">GitHub Mirror</a>, in the form of <a href="https://help.github.com/articles/using-pull-requests">Pull Requests</a>. Pull requests are basically a simpler way of offering a patch, by providing a pointer to a code branch that contains the change.</p>
<p>It is also possible to attach a patch to a <a href="https://issues.apache.org/jira/browse/FLINK">JIRA</a> issue.</p>
@@ -198,44 +198,43 @@
<li>
<p>It is typically helpful to switch to a <em>topic branch</em> for the changes. To create a dedicated branch based on the current master, use the following command:</p>
- <p><code>
-git checkout -b myBranch master
-</code></p>
+ <div class="highlight"><pre><code>git checkout -b myBranch master
+</code></pre></div>
</li>
<li>
- <p>Now you can create your changes, compile the code, and validate the changes. Here are some pointers on how to <a href="https://github.com/apache/flink/#build-apache-flink">build the code</a>.
-In addition to that, we recommend setting up Eclipse (or IntelliJ) using the “Import Maven Project” feature. If you want to work on the scala code you will need the following plugins:</p>
-
- <p><strong>Eclipse 4.x</strong>:</p>
+ <p>Now you can create your changes, compile the code, and validate the changes. Here are some pointers on how to <a href="https://github.com/apache/flink/#building-apache-flink-from-source">build the code</a>.
+In addition to that, we recommend setting up Eclipse (or IntelliJ) using the “Import Maven Project” feature:</p>
<ul>
- <li>scala-ide: http://download.scala-ide.org/sdk/e38/scala210/stable/site</li>
- <li>m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site</li>
- <li>build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.15.0/N/0.15.0.201206251206/</li>
+ <li>Select “Import” from the “File” menu.</li>
+ <li>Expand the “Maven” node, select “Existing Maven Projects”, and click the “Next” button.</li>
+ <li>Select the root directory by clicking on the “Browse” button and navigate to the top folder of the cloned Flink git repository.</li>
+ <li>Ensure that all projects are selected and click the “Finish” button.<br /><br /><!-- newline hack --></li>
</ul>
- <p><strong>Eclipse 3.7</strong>:</p>
+ <p>If you want to work on the Scala code you will need the following plugins:</p>
+
+ <p><strong>Eclipse 4.x</strong>:</p>
<ul>
- <li>scala-ide: http://download.scala-ide.org/sdk/e37/scala210/stable/site</li>
- <li>m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site</li>
- <li>build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.14.0/N/0.14.0.201109282148/</li>
+ <li>scala-ide: <code>http://download.scala-ide.org/sdk/e38/scala210/stable/site</code></li>
+ <li>m2eclipse-scala: <code>http://alchim31.free.fr/m2e-scala/update-site</code></li>
+ <li>build-helper-maven-plugin: <code>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.15.0/N/0.15.0.201206251206/</code><br /><br /><!-- newline hack --></li>
</ul>
- <p>When you don’t have the plugins your project will have build errors, you can just close the scala projects and ignore them.</p>
-
- <p>Import the Flink source code using Maven’s Import tool:</p>
+ <p><strong>Eclipse 3.7</strong>:</p>
<ul>
- <li>Select “Import” from the “File”-menu.</li>
- <li>Expand “Maven” node, select “Existing Maven Projects”, and click “next” button</li>
- <li>Select the root directory by clicking on the “Browse” button and navigate to the top folder of the cloned Flink git repository.</li>
- <li>Ensure that all projects are selected and click the “Finish” button.</li>
+ <li>scala-ide: <code>http://download.scala-ide.org/sdk/e37/scala210/stable/site</code></li>
+ <li>m2eclipse-scala: <code>http://alchim31.free.fr/m2e-scala/update-site</code></li>
+ <li>build-helper-maven-plugin: <code>https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.14.0/N/0.14.0.201109282148/</code><br /><br /><!-- newline hack --></li>
</ul>
+
+ <p>If you don’t have the plugins your project will have build errors, but you can just close the Scala projects and ignore them.</p>
</li>
<li>
- <p>After you have finalized your contribution, verify the compliance with the contribution guidelines (see below), and commit them. To make the changes easily mergeable, please rebase them to the latest version of the main repositories master branch. Assuming you created a topic branch (step 3), you can follow this sequence of commands to do that:
-Switch to the master branch, update it to the latest revision, switch back to your topic branch, and rebase it on top of the master branch.</p>
+ <p>After you have finalized your contribution, verify the compliance with the contribution guidelines (see below), and make the commit. To make the changes easily mergeable, please rebase them to the latest version of the main repository’s master branch. Assuming you created a topic branch (step 3), you can follow this sequence of commands to do that:
+switch to the master branch, update it to the latest revision, switch back to your topic branch, and rebase it on top of the master branch.</p>
<div class="highlight"><pre><code>git checkout master
git pull https://github.com/apache/flink.git master
@@ -245,11 +244,11 @@ git rebase master
<p>Have a look <a href="https://help.github.com/articles/using-git-rebase">here</a> for more information about rebasing commits.</p>
</li>
<li>
- <p>Push the contribution it back into your fork of the Flink repository.
-<code>
-git push origin myBranch
-</code>
-Go the website of your repository fork (<code>https://github.com/<your-user-name>/flink</code>) and use the “Create Pull Request” button to start creating a pull request. Make sure that the base fork is <code>apache/flink master</code> and the head fork selects the branch with your changes. Give the pull request a meaningful description and send it.</p>
+ <p>Push the contribution back into your fork of the Flink repository.</p>
+
+ <div class="highlight"><pre><code>git push origin myBranch
+</code></pre></div>
+ <p>Go the website of your repository fork (<code>https://github.com/<your-user-name>/flink</code>) and use the “Create Pull Request” button to start creating a pull request. Make sure that the base fork is <code>apache/flink master</code> and the head fork selects the branch with your changes. Give the pull request a meaningful description and send it.</p>
</li>
</ol>
@@ -257,43 +256,46 @@ Go the website of your repository fork (<code>https://github.com/<your-user-n
<p>Before sending a patch or pull request, please verify that it complies with the guidelines of the project. While we try to keep the set of guidelines small and easy, it is important to follow those rules in order to guarantee good code quality, to allow efficient reviews, and to allow committers to easily merge your changes.</p>
-<p>Please have a look at the <a href="/docs//coding_guidelines.html">coding guidelines</a> for a guide to the format of code and pull requests.</p>
+<p>Please have a look at the <a href="/coding-guidelines.html">coding guidelines</a> for a guide to the format of code and pull requests.</p>
+
+<p>Most important of all, verify that your changes are correct and do not break existing functionality. Run the existing tests by calling <code>mvn verify</code> in the root directory of the repository, and make sure that the tests succeed. We encourage every contributor to use a <em>continuous integration</em> service that will automatically test the code in your repository whenever you push a change. Flink is pre-configured for <a href="http://docs.travis-ci.com/">Travis CI</a>, which can be easily enabled for your private repository fork (it uses GitHub for authentication, so you don’t need an additional account). Simply add the <em>Travis CI</em> hook to your repository (<em>settings –> webhooks & services –> add service</em>) and enable tests for the “flink” repository on <a href="https://travis-ci.org/profile">Travis</a>.</p>
-<p>Most important of all, verify that your changes are correct and do not break existing functionality. Run the existing tests by calling <code>mvn verify</code> in the root directory of the repository, and make sure that the tests succeed. We encourage every contributor to use a <em>continuous integration</em> service that will automatically test the code in your repository whenever you push a change. Flink is pre-configured for <a href="http://docs.travis-ci.com/">Travis CI</a>, which can be easily enabled for your private repository fork (it uses GitHub for authentication, so you so not need an additional account). Simply add the <em>Travis CI</em> hook to your repository (<em>settings –> webhooks & services –> add service</em>) and enable tests for the “flink” repository on <a href="https://travis-ci.org/profile">Travis</a>.</p>
+<p>When contributing documentation, please review the rendered HTML versions of the documents you changed. You can look at the HTML pages by using the rendering script in preview mode.</p>
-<p>When contributing documentation, please review the rendered HTML versions of the documents you changed. You can look at the HTML pages by using the rendering script in preview mode.
-<code>
-cd docs
+<div class="highlight"><pre><code>cd docs
./build_docs.sh -p
-</code>
-Now, open your browser at <code>http://localhost:4000</code> and check out the pages you changed.</p>
+</code></pre></div>
+<p>Now, open your browser at <code>http://localhost:4000</code> and check out the pages you changed.</p>
<h2 id="contribute-changes-to-the-website">Contribute changes to the Website</h2>
-<p>The website of Apache Flink is hosted in a separate Git repository. The repository is located at https://git-wip-us.apache.org/repos/asf/flink-web.git.</p>
+<p>The website of Apache Flink is hosted in a separate Git repository. We suggest making a fork of the <a href="https://github.com/apache/flink-web">flink-web GitHub mirror repository</a>.</p>
+
+<p>To make changes to the website, you have to checkout its source code first. The website resides in the <code>asf-site</code> branch of the repository:</p>
-<p>To make changes to the website, you have to checkout its source code first. The website resides in the <code>asf-site</code> branch of the repository:
-<code>
-git clone -b asf-site https://git-wip-us.apache.org/repos/asf/flink-web.git
+<div class="highlight"><pre><code>git clone -b asf-site https://github.com/<your-user-name>/flink-web.git
cd flink-web
-</code></p>
+</code></pre></div>
<p>The <code>flink-web</code> directory contains the files that we use to build the website. We use <a href="http://jekyllrb.com/">Jekyll</a> to generate static HTML files for the website.</p>
<h3 id="files-and-directories-in-the-website-git-repository">Files and Directories in the website git repository</h3>
-<p>The files and directories in the website git repository have the following roles:
-- all files ending with <code>.md</code> are <a href="http://daringfireball.net/projects/markdown/">Markdown</a> files. Those are the input for the HTML files.
-- regular directories (not starting with an underscore (<code>_</code>)) contain also <code>.md</code> files. The directory structure is also represented in the generated HTML files.
-- the <code>_posts</code> directory contains one Markdown file for each blog post on the website. To contribute a post, just add a new file there.
-- the <code>_includes/</code> directory contains includeable files such as the navigation bar or the footer.
-- the <code>docs/</code> directory contains copies of the documentation of Flink for different releases. There is a directory inside <code>docs/</code> for each stable release and the latest SNAPSHOT version. The build script is taking care of the maintenance of this directory.
-- the <code>content/</code> directory contains the generated HTML files from Jekyll. It is important to place the files in this directory since the Apache Infrastructure to host the Flink website is pulling the HTML content from his directory. (For committers: When pushing changes to the website git, push also the updates in the <code>content/</code> directory!)
-- see the section below for he <code>build.sh</code> script</p>
+<p>The files and directories in the website git repository have the following roles:</p>
+
+<ul>
+ <li>all files ending with <code>.md</code> are <a href="http://daringfireball.net/projects/markdown/">Markdown</a> files. Those are the input for the HTML files.</li>
+ <li>regular directories (not starting with an underscore (<code>_</code>)) contain also <code>.md</code> files. The directory structure is also represented in the generated HTML files.</li>
+ <li>the <code>_posts</code> directory contains one Markdown file for each blog post on the website. To contribute a post, just add a new file there.</li>
+ <li>the <code>_includes/</code> directory contains includeable files such as the navigation bar or the footer.</li>
+ <li>the <code>docs/</code> directory contains copies of the documentation of Flink for different releases. There is a directory inside <code>docs/</code> for each stable release and the latest SNAPSHOT version. The build script is taking care of the maintenance of this directory.</li>
+ <li>the <code>content/</code> directory contains the generated HTML files from Jekyll. It is important to place the files in this directory since the Apache Infrastructure to host the Flink website is pulling the HTML content from his directory. (For committers: When pushing changes to the website repository, push also the updates in the <code>content/</code> directory!)</li>
+ <li>see the section below for the <code>build.sh</code> script.</li>
+</ul>
<h3 id="the-buildsh-script">The <code>build.sh</code> script</h3>
-<p>The <code>build.sh</code> script creates HTML files from the input Markdown files. Use the <code>-p</code> flag to let Jekyll serve a <strong>p</strong>review of the website on http://localhost:4000/.</p>
+<p>The <code>build.sh</code> script creates HTML files from the input Markdown files. Use the <code>-p</code> flag to let Jekyll serve a <strong>p</strong>review of the website on <code>http://localhost:4000/</code>.</p>
<p>The build script also takes care of maintaining the <code>docs/</code> directory. Set the <code>-u</code> flag to <strong>u</strong>pdate documentation. This includes fetching the Flink git repository and copying different versions of the documentation.</p>
@@ -313,11 +315,11 @@ cd flink-web
<h4 id="main-source-repositories">Main source repositories</h4>
-<p><strong>ASF writable</strong>: https://git-wip-us.apache.org/repos/asf/flink.git</p>
+<p><strong>ASF writable</strong>: <code>https://git-wip-us.apache.org/repos/asf/flink.git</code></p>
-<p><strong>ASF read-only</strong>: git://git.apache.org/repos/asf/flink.git</p>
+<p><strong>ASF read-only</strong>: <code>git://git.apache.org/repos/asf/flink.git</code></p>
-<p><strong>ASF read-only</strong>: https://github.com/apache/flink.git</p>
+<p><strong>ASF read-only</strong>: <code>https://github.com/apache/flink.git</code></p>
<p>Note: Flink does not build with Oracle JDK 6. It runs with Oracle JDK 6.</p>
@@ -325,12 +327,14 @@ cd flink-web
<h4 id="website-repositories">Website repositories</h4>
-<p><strong>ASF writable</strong>: https://git-wip-us.apache.org/repos/asf/flink-web.git</p>
+<p><strong>ASF writable</strong>: <code>https://git-wip-us.apache.org/repos/asf/flink-web.git</code></p>
+
+<p><strong>ASF read-only</strong>: <code>git://git.apache.org/repos/asf/flink-web.git</code></p>
-<p><strong>ASF read-only</strong>: git://git.apache.org/repos/asf/flink-web.git</p>
+<p><strong>ASF read-only</strong>: <code>https://github.com/apache/flink-web.git</code></p>
<p>Details on how to set the credentials for the ASF git repostiory are <a href="https://git-wip-us.apache.org/">linked here</a>.
-To merge pull requests from our GitHub mirror, there is a script in the source <code>./tools/merge_pull_request.sh.template</code>. Rename it to <code>merge_pull_request.sh</code> with the appropriate settings and use it for merging.</p>
+To merge pull requests from our Flink GitHub mirror, there is a script in the source <code>./tools/merge_pull_request.sh.template</code>. Rename it to <code>merge_pull_request.sh</code> with the appropriate settings and use it for merging.</p>
<h2 id="snapshots-nightly-builds">Snapshots (Nightly Builds)</h2>
http://git-wip-us.apache.org/repos/asf/flink-web/blob/1f917e3b/how-to-contribute.md
----------------------------------------------------------------------
diff --git a/how-to-contribute.md b/how-to-contribute.md
index f0b5b50..a75170e 100644
--- a/how-to-contribute.md
+++ b/how-to-contribute.md
@@ -2,15 +2,15 @@
title: "How To Contribute"
---
-The Flink project welcomes all sorts contributions in the form of code (improvements, features, bugfixes), documentation, tests, and community participation (discussions & questions).
+The Flink project welcomes all sort of contributions in the form of code (improvements, features, bugfixes), tests, documentation, and community participation (discussions & questions).
{% toc %}
## Easy Issues for Starters
-We maintain all known issues and feature drafts in the [Flink project JIRA](https://issues.apache.org/jira/issues/?jql=project+%3D+FLINK).
+We maintain all known issues and feature drafts in the [Flink JIRA project](https://issues.apache.org/jira/issues/?jql=project+%3D+FLINK).
-We also try to maintain a <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20FLINK%20AND%20resolution%20%3D%20Unresolved%20AND%20labels%20%3D%20starter%20ORDER%20BY%20priority%20DESC">list of simple "starter issues"</a> that we believe are good tasks for new contributors. Those tasks are meant to allow people to get into the project and become familiar with the process of contributing. Feel free to ask questions about issues that you would be interested in working on.
+We also try to maintain a [list of simple "starter issues"](https://issues.apache.org/jira/issues/?jql=project%20%3D%20FLINK%20AND%20resolution%20%3D%20Unresolved%20AND%20labels%20%3D%20starter%20ORDER%20BY%20priority%20DESC) that we believe are good tasks for new contributors. Those tasks are meant to allow people to get into the project and become familiar with the process of contributing. Feel free to ask questions about issues that you would be interested in working on.
In addition, you can find a list of ideas for projects and improvements in the [projects Wiki page](https://cwiki.apache.org/confluence/display/FLINK/Project+Ideas).
@@ -18,7 +18,7 @@ In addition, you can find a list of ideas for projects and improvements in the [
This section gives you a brief introduction in how to contribute code and documentation to Flink. We maintain both the code and the documentation in the same repository, so the process is essentially the same for both. We use [git](http://git-scm.com/) for the code and documentation version control. The documentation is located in the `docs/` subdirectory of the git repository.
-The Flink project accepts code contributions though the [GitHub Mirror](https://github.com/apache/flink), in the form of [Pull Requests](https://help.github.com/articles/using-pull-requests). Pull requests are basically a simpler way of offering a patch, by providing a pointer to a code branch that contains the change.
+The Flink project accepts code contributions through the [GitHub Mirror](https://github.com/apache/flink), in the form of [Pull Requests](https://help.github.com/articles/using-pull-requests). Pull requests are basically a simpler way of offering a patch, by providing a pointer to a code branch that contains the change.
It is also possible to attach a patch to a [JIRA]({{site.FLINK_ISSUES_URL}}) issue.
@@ -28,43 +28,43 @@ It is also possible to attach a patch to a [JIRA]({{site.FLINK_ISSUES_URL}}) iss
1. The first step is to create yourself a copy of the Flink code base. We suggest to fork the [Flink GitHub Mirror Repository](https://github.com/apache/flink) into your own [GitHub](https://github.com) account. You need to register on GitHub for that, if you have no account so far.
2. Next, clone your repository fork to your local machine.
-
+
```
git clone https://github.com/<your-user-name>/flink.git
```
3. It is typically helpful to switch to a *topic branch* for the changes. To create a dedicated branch based on the current master, use the following command:
- ```
+ ```
git checkout -b myBranch master
```
-4. Now you can create your changes, compile the code, and validate the changes. Here are some pointers on how to [build the code](https://github.com/apache/flink/#build-apache-flink).
-In addition to that, we recommend setting up Eclipse (or IntelliJ) using the "Import Maven Project" feature. If you want to work on the scala code you will need the following plugins:
+4. Now you can create your changes, compile the code, and validate the changes. Here are some pointers on how to [build the code](https://github.com/apache/flink/#building-apache-flink-from-source).
+In addition to that, we recommend setting up Eclipse (or IntelliJ) using the "Import Maven Project" feature:
- **Eclipse 4.x**:
+ * Select "Import" from the "File" menu.
+ * Expand the "Maven" node, select "Existing Maven Projects", and click the "Next" button.
+ * Select the root directory by clicking on the "Browse" button and navigate to the top folder of the cloned Flink git repository.
+ * Ensure that all projects are selected and click the "Finish" button.<br/><br/><!-- newline hack -->
- * scala-ide: http://download.scala-ide.org/sdk/e38/scala210/stable/site
- * m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site
- * build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.15.0/N/0.15.0.201206251206/
+ If you want to work on the Scala code you will need the following plugins:
- **Eclipse 3.7**:
+ **Eclipse 4.x**:
- * scala-ide: http://download.scala-ide.org/sdk/e37/scala210/stable/site
- * m2eclipse-scala: http://alchim31.free.fr/m2e-scala/update-site
- * build-helper-maven-plugin: https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.14.0/N/0.14.0.201109282148/
+ * scala-ide: `http://download.scala-ide.org/sdk/e38/scala210/stable/site`
+ * m2eclipse-scala: `http://alchim31.free.fr/m2e-scala/update-site`
+ * build-helper-maven-plugin: `https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.15.0/N/0.15.0.201206251206/`<br/><br/><!-- newline hack -->
- When you don't have the plugins your project will have build errors, you can just close the scala projects and ignore them.
+ **Eclipse 3.7**:
- Import the Flink source code using Maven's Import tool:
+ * scala-ide: `http://download.scala-ide.org/sdk/e37/scala210/stable/site`
+ * m2eclipse-scala: `http://alchim31.free.fr/m2e-scala/update-site`
+ * build-helper-maven-plugin: `https://repository.sonatype.org/content/repositories/forge-sites/m2e-extras/0.14.0/N/0.14.0.201109282148/`<br/><br/><!-- newline hack -->
- * Select "Import" from the "File"-menu.
- * Expand "Maven" node, select "Existing Maven Projects", and click "next" button
- * Select the root directory by clicking on the "Browse" button and navigate to the top folder of the cloned Flink git repository.
- * Ensure that all projects are selected and click the "Finish" button.
+ If you don't have the plugins your project will have build errors, but you can just close the Scala projects and ignore them.
-5. After you have finalized your contribution, verify the compliance with the contribution guidelines (see below), and commit them. To make the changes easily mergeable, please rebase them to the latest version of the main repositories master branch. Assuming you created a topic branch (step 3), you can follow this sequence of commands to do that:
-Switch to the master branch, update it to the latest revision, switch back to your topic branch, and rebase it on top of the master branch.
+5. After you have finalized your contribution, verify the compliance with the contribution guidelines (see below), and make the commit. To make the changes easily mergeable, please rebase them to the latest version of the main repository's master branch. Assuming you created a topic branch (step 3), you can follow this sequence of commands to do that:
+switch to the master branch, update it to the latest revision, switch back to your topic branch, and rebase it on top of the master branch.
```
git checkout master
@@ -75,8 +75,9 @@ git rebase master
Have a look [here](https://help.github.com/articles/using-git-rebase) for more information about rebasing commits.
-6. Push the contribution it back into your fork of the Flink repository.
-```
+6. Push the contribution back into your fork of the Flink repository.
+
+ ```
git push origin myBranch
```
Go the website of your repository fork (`https://github.com/<your-user-name>/flink`) and use the "Create Pull Request" button to start creating a pull request. Make sure that the base fork is `apache/flink master` and the head fork selects the branch with your changes. Give the pull request a meaningful description and send it.
@@ -86,11 +87,12 @@ Go the website of your repository fork (`https://github.com/<your-user-name>/fli
Before sending a patch or pull request, please verify that it complies with the guidelines of the project. While we try to keep the set of guidelines small and easy, it is important to follow those rules in order to guarantee good code quality, to allow efficient reviews, and to allow committers to easily merge your changes.
-Please have a look at the [coding guidelines]({{ site.baseurl }}/docs/{{ site.FLINK_CURRENT_DOCUMENTATION }}/coding_guidelines.html) for a guide to the format of code and pull requests.
+Please have a look at the [coding guidelines]({{ site.baseurl }}/coding-guidelines.html) for a guide to the format of code and pull requests.
-Most important of all, verify that your changes are correct and do not break existing functionality. Run the existing tests by calling `mvn verify` in the root directory of the repository, and make sure that the tests succeed. We encourage every contributor to use a *continuous integration* service that will automatically test the code in your repository whenever you push a change. Flink is pre-configured for [Travis CI](http://docs.travis-ci.com/), which can be easily enabled for your private repository fork (it uses GitHub for authentication, so you so not need an additional account). Simply add the *Travis CI* hook to your repository (*settings --> webhooks & services --> add service*) and enable tests for the "flink" repository on [Travis](https://travis-ci.org/profile).
+Most important of all, verify that your changes are correct and do not break existing functionality. Run the existing tests by calling `mvn verify` in the root directory of the repository, and make sure that the tests succeed. We encourage every contributor to use a *continuous integration* service that will automatically test the code in your repository whenever you push a change. Flink is pre-configured for [Travis CI](http://docs.travis-ci.com/), which can be easily enabled for your private repository fork (it uses GitHub for authentication, so you don't need an additional account). Simply add the *Travis CI* hook to your repository (*settings --> webhooks & services --> add service*) and enable tests for the "flink" repository on [Travis](https://travis-ci.org/profile).
When contributing documentation, please review the rendered HTML versions of the documents you changed. You can look at the HTML pages by using the rendering script in preview mode.
+
```
cd docs
./build_docs.sh -p
@@ -99,11 +101,12 @@ Now, open your browser at `http://localhost:4000` and check out the pages you ch
## Contribute changes to the Website
-The website of Apache Flink is hosted in a separate Git repository. The repository is located at https://git-wip-us.apache.org/repos/asf/flink-web.git.
+The website of Apache Flink is hosted in a separate Git repository. We suggest making a fork of the [flink-web GitHub mirror repository](https://github.com/apache/flink-web).
To make changes to the website, you have to checkout its source code first. The website resides in the `asf-site` branch of the repository:
+
```
-git clone -b asf-site https://git-wip-us.apache.org/repos/asf/flink-web.git
+git clone -b asf-site https://github.com/<your-user-name>/flink-web.git
cd flink-web
```
@@ -112,18 +115,19 @@ The `flink-web` directory contains the files that we use to build the website. W
### Files and Directories in the website git repository
The files and directories in the website git repository have the following roles:
+
- all files ending with `.md` are [Markdown](http://daringfireball.net/projects/markdown/) files. Those are the input for the HTML files.
- regular directories (not starting with an underscore (`_`)) contain also `.md` files. The directory structure is also represented in the generated HTML files.
- the `_posts` directory contains one Markdown file for each blog post on the website. To contribute a post, just add a new file there.
- the `_includes/` directory contains includeable files such as the navigation bar or the footer.
- the `docs/` directory contains copies of the documentation of Flink for different releases. There is a directory inside `docs/` for each stable release and the latest SNAPSHOT version. The build script is taking care of the maintenance of this directory.
-- the `content/` directory contains the generated HTML files from Jekyll. It is important to place the files in this directory since the Apache Infrastructure to host the Flink website is pulling the HTML content from his directory. (For committers: When pushing changes to the website git, push also the updates in the `content/` directory!)
-- see the section below for he `build.sh` script
+- the `content/` directory contains the generated HTML files from Jekyll. It is important to place the files in this directory since the Apache Infrastructure to host the Flink website is pulling the HTML content from his directory. (For committers: When pushing changes to the website repository, push also the updates in the `content/` directory!)
+- see the section below for the `build.sh` script.
### The `build.sh` script
-The `build.sh` script creates HTML files from the input Markdown files. Use the `-p` flag to let Jekyll serve a **p**review of the website on http://localhost:4000/.
+The `build.sh` script creates HTML files from the input Markdown files. Use the `-p` flag to let Jekyll serve a **p**review of the website on `http://localhost:4000/`.
The build script also takes care of maintaining the `docs/` directory. Set the `-u` flag to **u**pdate documentation. This includes fetching the Flink git repository and copying different versions of the documentation.
@@ -144,11 +148,11 @@ Only the infrastructure team of the ASF has administrative access to the GitHub
#### Main source repositories
-**ASF writable**: https://git-wip-us.apache.org/repos/asf/flink.git
+**ASF writable**: `https://git-wip-us.apache.org/repos/asf/flink.git`
-**ASF read-only**: git://git.apache.org/repos/asf/flink.git
+**ASF read-only**: `git://git.apache.org/repos/asf/flink.git`
-**ASF read-only**: https://github.com/apache/flink.git
+**ASF read-only**: `https://github.com/apache/flink.git`
Note: Flink does not build with Oracle JDK 6. It runs with Oracle JDK 6.
@@ -156,12 +160,14 @@ If you want to build for Hadoop 1, activate the build profile via `mvn clean pac
#### Website repositories
-**ASF writable**: https://git-wip-us.apache.org/repos/asf/flink-web.git
+**ASF writable**: `https://git-wip-us.apache.org/repos/asf/flink-web.git`
+
+**ASF read-only**: `git://git.apache.org/repos/asf/flink-web.git`
-**ASF read-only**: git://git.apache.org/repos/asf/flink-web.git
+**ASF read-only**: `https://github.com/apache/flink-web.git`
Details on how to set the credentials for the ASF git repostiory are [linked here](https://git-wip-us.apache.org/).
-To merge pull requests from our GitHub mirror, there is a script in the source `./tools/merge_pull_request.sh.template`. Rename it to `merge_pull_request.sh` with the appropriate settings and use it for merging.
+To merge pull requests from our Flink GitHub mirror, there is a script in the source `./tools/merge_pull_request.sh.template`. Rename it to `merge_pull_request.sh` with the appropriate settings and use it for merging.
## Snapshots (Nightly Builds)