You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2014/11/13 19:24:43 UTC
incubator-flink git commit: [scala] Self-contained build for scala
examples
Repository: incubator-flink
Updated Branches:
refs/heads/master 8f9d8ea9c -> 9ff2e5b32
[scala] Self-contained build for scala examples
This closes #199.
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/9ff2e5b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/9ff2e5b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/9ff2e5b3
Branch: refs/heads/master
Commit: 9ff2e5b32d0e23f0c9ee817ea1a86a71b2c4698d
Parents: 8f9d8ea
Author: mbalassi <mb...@apache.org>
Authored: Thu Nov 13 11:05:47 2014 +0100
Committer: uce <uc...@apache.org>
Committed: Thu Nov 13 19:23:25 2014 +0100
----------------------------------------------------------------------
flink-examples/flink-scala-examples/pom.xml | 217 ++++++++++++++++++-----
1 file changed, 168 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/9ff2e5b3/flink-examples/flink-scala-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-scala-examples/pom.xml b/flink-examples/flink-scala-examples/pom.xml
index d9a34ae..ad058fc 100644
--- a/flink-examples/flink-scala-examples/pom.xml
+++ b/flink-examples/flink-scala-examples/pom.xml
@@ -170,164 +170,283 @@ under the License.
</configuration>
</plugin>
+ <!-- get default data from flink-java-examples package -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-java-examples</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <includes>**/util/*Data*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
- <!-- These examples are currently not self-contained
-
+
+ <!-- KMeans -->
<execution>
<id>KMeans</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
-
+
<configuration>
<classifier>KMeans</classifier>
+
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.datamining.KMeans</program-class>
+ <program-class>org.apache.flink.examples.scala.clustering.KMeans</program-class>
</manifestEntries>
</archive>
-
+
<includes>
- <include>**/datamining/KMeans*.class</include>
+ <include>**/scala/clustering/KMeans.class</include>
+ <include>**/scala/clustering/KMeans$*.class</include>
+ <include>**/java/clustering/util/KMeansDataGenerator.class</include>
+ <include>**/java/clustering/util/KMeansData.class</include>
</includes>
</configuration>
</execution>
-
+
+ <!-- Transitive Closure -->
<execution>
- <id>ComputeEdgeDegrees</id>
+ <id>TransitiveClosure</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
-
<configuration>
- <classifier>ComputeEdgeDegrees</classifier>
-
+ <classifier>TransitiveClosure</classifier>
+
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.graph.ComputeEdgeDegrees</program-class>
+ <program-class>org.apache.flink.examples.scala.graph.TransitiveClosureNaive</program-class>
</manifestEntries>
</archive>
-
+
<includes>
- <include>**/graph/ComputeEdgeDegrees*.class</include>
+ <include>**/scala/graph/TransitiveClosureNaive.class</include>
+ <include>**/scala/graph/TransitiveClosureNaive$*.class</include>
+ <include>**/java/graph/util/ConnectedComponentsData.class</include>
</includes>
</configuration>
</execution>
-
+
+ <!-- Connected Components -->
<execution>
- <id>EnumTrianglesOnEdgesWithDegrees</id>
+ <id>ConnectedComponents</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
-
<configuration>
- <classifier>EnumTrianglesOnEdgesWithDegrees</classifier>
-
+ <classifier>ConnectedComponents</classifier>
+
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.graph.EnumTrianglesOnEdgesWithDegrees</program-class>
+ <program-class>org.apache.flink.examples.scala.graph.ConnectedComponents</program-class>
</manifestEntries>
</archive>
-
+
<includes>
- <include>**/graph/EnumTrianglesOnEdgesWithDegrees*.class</include>
+ <include>**/scala/graph/ConnectedComponents.class</include>
+ <include>**/scala/graph/ConnectedComponents$*.class</include>
+ <include>**/java/graph/util/ConnectedComponentsData.class</include>
</includes>
</configuration>
</execution>
-
+
+ <!-- EnumTriangles Basic -->
<execution>
- <id>TPCHQuery3</id>
+ <id>EnumTrianglesBasic</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
-
<configuration>
- <classifier>TPCHQuery3</classifier>
-
+ <classifier>EnumTrianglesBasic</classifier>
+
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.relational.TPCHQuery3</program-class>
+ <program-class>org.apache.flink.examples.scala.graph.EnumTrianglesBasic</program-class>
</manifestEntries>
</archive>
-
+
<includes>
- <include>**/relational/TPCHQuery3*.class</include>
+ <include>**/scala/graph/EnumTrianglesBasic.class</include>
+ <include>**/scala/graph/EnumTrianglesBasic$*.class</include>
+ <include>**/java/graph/util/EnumTrianglesData.class</include>
</includes>
</configuration>
</execution>
-
+
+ <!-- EnumTriangles Opt -->
<execution>
- <id>WordCount</id>
+ <id>EnumTrianglesOpt</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
-
<configuration>
- <classifier>WordCount</classifier>
-
+ <classifier>EnumTrianglesOpt</classifier>
+
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.wordcount.WordCount</program-class>
+ <program-class>org.apache.flink.examples.scala.graph.EnumTrianglesOpt</program-class>
</manifestEntries>
</archive>
-
+
<includes>
- <include>**/wordcount/WordCount*.class</include>
- <include>**/wordcount/util/WordCountData.class</include>
+ <include>**/scala/graph/EnumTrianglesOpt.class</include>
+ <include>**/scala/graph/EnumTrianglesOpt$*.class</include>
+ <include>**/java/graph/util/EnumTrianglesData.class</include>
</includes>
</configuration>
</execution>
+ <!-- PageRank Basic-->
<execution>
- <id>ConnectedComponents</id>
+ <id>PageRankBasic</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
- <classifier>ConnectedComponents</classifier>
+ <classifier>PageRankBasic</classifier>
+
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.graph.ConnectedComponents</program-class>
+ <program-class>org.apache.flink.examples.scala.graph.PageRankBasic</program-class>
</manifestEntries>
</archive>
+
<includes>
- DOES NOT WORK <include>**/graph/ConnectedComponents*.class</include>
+ <include>**/scala/graph/PageRankBasic.class</include>
+ <include>**/scala/graph/PageRankBasic$*.class</include>
+ <include>**/java/graph/util/PageRankData.class</include>
</includes>
</configuration>
</execution>
+ <!-- These queries are currently not self-contained -->
+
+ <!-- TPC-H Query 10 -->
+
+ <!--
<execution>
- <id>TransitiveClosureNaive</id>
+ <id>TPCHQuery10</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
+ <configuration>
+ <classifier>TPCHQuery10</classifier>
+ <archive>
+ <manifestEntries>
+ <program-class>org.apache.flink.examples.scala.relational.TPCHQuery10</program-class>
+ </manifestEntries>
+ </archive>
+ <includes>
+ <include>**/scala/relational/TPCHQuery10.class</include>
+ <include>**/scala/relational/TPCHQuery10$*.class</include>
+ </includes>
+ </configuration>
+ </execution> -->
+
+ <!-- TPC-H Query 3 -->
+ <!--
+ <execution>
+ <id>TPCHQuery3</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
<configuration>
- <classifier>TransitiveClosureNaive</classifier>
+ <classifier>TPCHQuery3</classifier>
<archive>
<manifestEntries>
- <program-class>org.apache.flink.examples.scala.graph.TransitiveClosureNaive</program-class>
+ <program-class>org.apache.flink.examples.scala.relational.TPCHQuery3</program-class>
+ </manifestEntries>
+ </archive>
+ <includes>
+ <include>**/scala/relational/TPCHQuery3.class</include>
+ <include>**/scala/relational/TPCHQuery3$*.class</include>
+ </includes>
+ </configuration>
+ </execution> -->
+
+ <!-- WebLogAnalysis -->
+ <execution>
+ <id>WebLogAnalysis</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>WebLogAnalysis</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>org.apache.flink.examples.scala.relational.WebLogAnalysis</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/scala/relational/WebLogAnalysis.class</include>
+ <include>**/scala/relational/WebLogAnalysis$*.class</include>
+ <include>**/java/relational/util/WebLogData.class</include>
+ <include>**/java/relational/util/WebLogDataGenerator.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- WordCount -->
+ <execution>
+ <id>WordCount</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>WordCount</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>org.apache.flink.examples.scala.wordcount.WordCount</program-class>
</manifestEntries>
</archive>
<includes>
- <include>**/wordcount/TransitiveClosureNaive*.class</include>
- DOES NOT WORK <include>**/java/graph/util/ConnectedComponentsData.class</include>
+ <include>**/scala/wordcount/WordCount.class</include>
+ <include>**/scala/wordcount/WordCount$*.class</include>
+ <include>**/java/wordcount/util/WordCountData.class</include>
</includes>
</configuration>
</execution>
- -->
</executions>
</plugin>