You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2015/06/08 11:11:25 UTC

[1/3] flink git commit: [FLINK-2080] Document how to use Flink with sbt

Repository: flink
Updated Branches:
  refs/heads/master 16ab1fd97 -> 3e9af8202


[FLINK-2080] Document how to use Flink with sbt

Closes #787


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3e9af820
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3e9af820
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3e9af820

Branch: refs/heads/master
Commit: 3e9af8202e225173d506ce0ac7b37a155003fcfd
Parents: 80b1d56
Author: Christian Wuerz <ch...@gmail.com>
Authored: Thu Jun 4 20:05:46 2015 +0200
Committer: mbalassi <mb...@apache.org>
Committed: Mon Jun 8 11:10:08 2015 +0200

----------------------------------------------------------------------
 docs/quickstart/scala_api_quickstart.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/3e9af820/docs/quickstart/scala_api_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/quickstart/scala_api_quickstart.md b/docs/quickstart/scala_api_quickstart.md
index 26a4bc5..7aaa36f 100644
--- a/docs/quickstart/scala_api_quickstart.md
+++ b/docs/quickstart/scala_api_quickstart.md
@@ -23,6 +23,7 @@ under the License.
 * This will be replaced by the TOC
 {:toc}
 
+
 Start working on your Flink Scala program in a few simple steps.
 
 ## Requirements
@@ -134,3 +135,19 @@ object WordCountJob {
 For a complete overview over our API, have a look at the [Programming Guide]({{ site.baseurl }}/apis/programming_guide.html) and [further example programs]({{ site.baseurl }}/apis/examples.html). If you have any trouble, ask on our [Mailing List](http://mail-archives.apache.org/mod_mbox/flink-dev/). We are happy to provide help.
 
 
+
+## Alternative Build Tools: SBT
+ 
+To build and run applications with SBT instead of Maven is pretty straight forward. After creating the standard sbt [directory layout](http://www.scala-sbt.org/0.13/tutorial/Directories.html) it's enough to add the Flink dependencies to the `build.sbt` file:
+
+~~~scala
+libraryDependencies ++= Seq("org.apache.flink" % "flink-scala" % "{{site.version}}", "org.apache.flink" % "flink-clients" % "{{site.version}}") 
+~~~
+
+Now the application can be executed by `sbt run`. By default SBT runs an application in the same JVM itself is running in. This can lead to lass loading issues with Flink. To avoid these, append the following line to `build.sbt`:
+
+~~~scala
+fork in run := true 
+~~~
+
+


[3/3] flink git commit: [FLINK-2153] Exclude Hbase annotations

Posted by mb...@apache.org.
[FLINK-2153] Exclude Hbase annotations

This is a temporal workaround for a bug in hbase.

Closes #800


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1484e002
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1484e002
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1484e002

Branch: refs/heads/master
Commit: 1484e0022ffd0711b1261b1de51e2fcf85bacd24
Parents: 16ab1fd
Author: mbalassi <mb...@apache.org>
Authored: Sat Jun 6 13:36:08 2015 +0200
Committer: mbalassi <mb...@apache.org>
Committed: Mon Jun 8 11:10:08 2015 +0200

----------------------------------------------------------------------
 flink-staging/flink-hbase/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/1484e002/flink-staging/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-staging/flink-hbase/pom.xml b/flink-staging/flink-hbase/pom.xml
index 1a5a1db..47beb58 100644
--- a/flink-staging/flink-hbase/pom.xml
+++ b/flink-staging/flink-hbase/pom.xml
@@ -146,6 +146,11 @@ under the License.
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-hdfs</artifactId>
 				</exclusion>
+				<!-- Bug in hbase annotations, can be removed when fixed. See FLINK-2153. -->
+				<exclusion>
+					<groupId>org.apache.hbase</groupId>
+					<artifactId>hbase-annotations</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>


[2/3] flink git commit: Add CONTRIBUTING.md file with pointers to our guides

Posted by mb...@apache.org.
Add CONTRIBUTING.md file with pointers to our guides

Closes #778


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/80b1d566
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/80b1d566
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/80b1d566

Branch: refs/heads/master
Commit: 80b1d5667eeec0bf0cc50ea86fc0c2c08f2b6a3d
Parents: 1484e00
Author: Robert Metzger <rm...@apache.org>
Authored: Thu Jun 4 13:45:48 2015 +0200
Committer: mbalassi <mb...@apache.org>
Committed: Mon Jun 8 11:10:08 2015 +0200

----------------------------------------------------------------------
 CONTRIBUTING.md | 11 +++++++++++
 pom.xml         |  1 +
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/80b1d566/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..272f6ea
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,11 @@
+# How to contribute to Apache Flink
+
+Thank you for your intention to contribute to the Apache Flink project. As an open-source community, we highly appreciate external contributions to our project.
+
+To make the process smooth for the project *committers* (those who review and accept changes) and *contributors* (those who propose new changes via pull requests), there are a few rules to follow.
+
+## Contribution Guidelines
+
+Please check out the [How to Contribute guide](http://flink.apache.org/how-to-contribute.html) to understand how contributions are made.
+There is also a list of [Coding Guidelines](http://flink.apache.org/coding-guidelines.html) that you should follow.
+

http://git-wip-us.apache.org/repos/asf/flink/blob/80b1d566/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1e0231..83dddc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -735,6 +735,7 @@ under the License.
 						<!-- Administrative files in the main trunk. -->
 						<exclude>**/README.md</exclude>
 						<exclude>CHANGELOG</exclude>
+						<exclude>CONTRIBUTING.md</exclude>
 						<exclude>CONTRIBUTORS</exclude>
 						<exclude>DEPENDENCIES</exclude>
 						<!-- Build files -->