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 2014/12/18 23:22:49 UTC
[2/5] incubator-flink git commit: [dist] Updated the assembly of the
examples subdirectory
[dist] Updated the assembly of the examples subdirectory
Excluded the scala example jars
Excluded the example source code subdirectories
This closes #274
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/ff05df90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/ff05df90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/ff05df90
Branch: refs/heads/master
Commit: ff05df90c2d97acb4a98da5cac9e07a0f37825d9
Parents: c5e9a51
Author: mbalassi <mb...@apache.org>
Authored: Thu Dec 18 00:28:07 2014 +0100
Committer: mbalassi <mb...@apache.org>
Committed: Thu Dec 18 20:07:27 2014 +0100
----------------------------------------------------------------------
flink-dist/src/main/assemblies/bin.xml | 30 ----------------------------
flink-dist/src/main/assemblies/yarn.xml | 14 -------------
2 files changed, 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/ff05df90/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 9ad8e47..31f80a6 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -132,36 +132,6 @@ under the License.
</excludes>
</fileSet>
- <fileSet>
- <!-- copy jar files of scala examples -->
- <directory>../flink-examples/flink-scala-examples/target</directory>
- <outputDirectory>examples</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>flink-scala-examples-${project.version}.jar</exclude>
- <exclude>original-flink-scala-examples-${project.version}.jar</exclude>
- <exclude>flink-scala-examples-${project.version}-sources.jar</exclude>
- <exclude>flink-scala-examples-${project.version}-javadoc.jar</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <!-- copy java examples src -->
- <directory>../flink-examples/flink-java-examples/src/main/java/org/apache/flink/example/java</directory>
- <outputDirectory>examples/java-src/</outputDirectory>
- <fileMode>0644</fileMode>
- </fileSet>
-
- <fileSet>
- <!-- copy scala examples src -->
- <directory>../flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala</directory>
- <outputDirectory>examples/scala-src/</outputDirectory>
- <fileMode>0644</fileMode>
- </fileSet>
-
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/ff05df90/flink-dist/src/main/assemblies/yarn.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/yarn.xml b/flink-dist/src/main/assemblies/yarn.xml
index 7d49b01..1580175 100644
--- a/flink-dist/src/main/assemblies/yarn.xml
+++ b/flink-dist/src/main/assemblies/yarn.xml
@@ -92,20 +92,6 @@ under the License.
</excludes>
</fileSet>
- <fileSet>
- <!-- copy jar files of scala examples -->
- <directory>../flink-examples/flink-scala-examples/target</directory>
- <outputDirectory>examples</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>flink-scala-examples-${project.version}.jar</exclude>
- <exclude>original-flink-scala-examples-${project.version}.jar</exclude>
- <exclude>flink-scala-examples-${project.version}-sources.jar</exclude>
- </excludes>
- </fileSet>
</fileSets>
<files>