You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/12 15:09:00 UTC
[1/2] flink git commit: [FLINK-7131] [streaming] Include
WordCountData in example jars
Repository: flink
Updated Branches:
refs/heads/master 251fb9845 -> 8987df556
[FLINK-7131] [streaming] Include WordCountData in example jars
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8987df55
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8987df55
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8987df55
Branch: refs/heads/master
Commit: 8987df55698b659c241857dadbc175bc786e828a
Parents: 6522065
Author: zentol <ch...@apache.org>
Authored: Sat Jul 8 08:11:34 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 12 17:07:21 2017 +0200
----------------------------------------------------------------------
flink-examples/flink-examples-streaming/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8987df55/flink-examples/flink-examples-streaming/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
index d6ff156..b023cd5 100644
--- a/flink-examples/flink-examples-streaming/pom.xml
+++ b/flink-examples/flink-examples-streaming/pom.xml
@@ -115,7 +115,7 @@ under the License.
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- <includes>org/apache/flink/examples/java/wordcount/util/WordCountData.class</includes>
+ <includes>org/apache/flink/streaming/examples/wordcount/util/WordCountData.class</includes>
</artifactItem>
<!-- For JSON utilities -->
<artifactItem>
@@ -256,7 +256,7 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/wordcount/PojoExample.class</include>
<include>org/apache/flink/streaming/examples/wordcount/PojoExample$*.class</include>
- <include>org/apache/flink/examples/java/wordcount/util/WordCountData.class</include>
+ <include>org/apache/flink/streaming/examples/wordcount/util/WordCountData.class</include>
</includes>
</configuration>
</execution>
@@ -280,7 +280,7 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/wordcount/WordCount.class</include>
<include>org/apache/flink/streaming/examples/wordcount/WordCount$*.class</include>
- <include>org/apache/flink/examples/java/wordcount/util/WordCountData.class</include>
+ <include>org/apache/flink/streaming/examples/wordcount/util/WordCountData.class</include>
</includes>
</configuration>
</execution>
[2/2] flink git commit: [FLINK-7138] [storm] Include WordCountData in
example jars
Posted by ch...@apache.org.
[FLINK-7138] [storm] Include WordCountData in example jars
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/65220651
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/65220651
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/65220651
Branch: refs/heads/master
Commit: 652206519a0974fadfe4606a385f3cd2ab03a481
Parents: 251fb98
Author: zentol <ch...@apache.org>
Authored: Sat Jul 8 08:08:49 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 12 17:07:21 2017 +0200
----------------------------------------------------------------------
flink-contrib/flink-storm-examples/pom.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/65220651/flink-contrib/flink-storm-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml
index 85d21bf..2133eef 100644
--- a/flink-contrib/flink-storm-examples/pom.xml
+++ b/flink-contrib/flink-storm-examples/pom.xml
@@ -223,7 +223,7 @@ under the License.
<include>org/apache/flink/storm/util/AbstractLineSpout.class</include>
<include>org/apache/flink/storm/util/FileSpout.class</include>
<include>org/apache/flink/storm/util/InMemorySpout.class</include>
- <include>org/apache/flink/examples/java/wordcount/util/WordCountData.class</include>
+ <include>org/apache/flink/storm/wordcount/util/WordCountData.class</include>
</includes>
</configuration>
</execution>
@@ -266,7 +266,7 @@ under the License.
<!-- Word Count -->
<include>org/apache/flink/storm/wordcount/BoltTokenizerWordCount.class</include>
<include>org/apache/flink/storm/wordcount/operators/BoltTokenizer.class</include>
- <include>org/apache/flink/examples/java/wordcount/util/WordCountData.class</include>
+ <include>org/apache/flink/storm/wordcount/util/WordCountData.class</include>
</includes>
</configuration>
</execution>
@@ -355,8 +355,7 @@ under the License.
<include>org/apache/flink/storm/wordcount/WordCountTopology.class</include>
<include>org/apache/flink/storm/wordcount/operators/*.class</include>
<include>org/apache/flink/storm/util/*.class</include>
- <include>org/apache/flink/examples/java/wordcount/util/WordCountData.class
- </include>
+ <include>org/apache/flink/storm/wordcount/util/WordCountData.class</include>
</includes>
</filter>
<filter>