You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/04/28 11:45:25 UTC
flink git commit: [FLINK-6410] [build] Fix Gelly Example packaging to
support different Scala versions
Repository: flink
Updated Branches:
refs/heads/master bdf5c486f -> 03afbca5d
[FLINK-6410] [build] Fix Gelly Example packaging to support different Scala versions
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/03afbca5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/03afbca5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/03afbca5
Branch: refs/heads/master
Commit: 03afbca5d047988e7fd8aff5d8b83ddee19570c9
Parents: bdf5c48
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Apr 28 11:43:28 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Apr 28 13:44:56 2017 +0200
----------------------------------------------------------------------
flink-dist/src/main/assemblies/bin.xml | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/03afbca5/flink-dist/src/main/assemblies/bin.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index d3f2005..c3385e1 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -54,19 +54,12 @@ under the License.
<fileMode>0644</fileMode>
</file>
+ <!-- copy the config file -->
<file>
<source>src/main/resources/flink-conf.yaml</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</file>
-
- <!-- copy jar file of the Gelly examples -->
- <file>
- <source>../flink-libraries/flink-gelly-examples/target/flink-gelly-examples_2.10-${project.version}.jar</source>
- <outputDirectory>examples/</outputDirectory>
- <destName>flink-gelly-examples_2.10-${project.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
</files>
<fileSets>
@@ -181,6 +174,20 @@ under the License.
</excludes>
</fileSet>
+ <!-- copy jar files of the gelly examples -->
+ <fileSet>
+ <directory>../flink-libraries/flink-gelly-examples/target</directory>
+ <outputDirectory>examples/gelly</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>original-*.jar</exclude>
+ <exclude>*-tests.jar</exclude>
+ </excludes>
+ </fileSet>
+
<!-- copy python package -->
<fileSet>
<directory>../flink-libraries/flink-python/src/main/python/org/apache/flink/python/api</directory>