beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [1/3] incubator-beam git commit: [BEAM-100] [flink] update to Flink 1.0.0
Date Tue, 08 Mar 2016 16:28:25 GMT
Repository: incubator-beam
Updated Branches:
  refs/heads/master b864ce82a -> 1f9d02c77


[BEAM-100] [flink] update to Flink 1.0.0


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1f9d02c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1f9d02c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1f9d02c7

Branch: refs/heads/master
Commit: 1f9d02c775825f8f780c214f27baa19a9a21aa4b
Parents: 9ed74f1
Author: Maximilian Michels <mxm@apache.org>
Authored: Tue Mar 8 15:08:28 2016 +0100
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue Mar 8 17:25:53 2016 +0100

----------------------------------------------------------------------
 runners/flink/pom.xml                           |  9 ++-----
 .../apache/beam/runners/flink/AvroITCase.java   | 28 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f9d02c7/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 252c5cc..9bd705c 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -47,7 +47,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <flink.version>1.0-SNAPSHOT</flink.version>
+        <flink.version>1.0.0</flink.version>
         <beam.version>1.5.0-SNAPSHOT</beam.version>
         <!-- Default parameters for mvn exec:exec -->
         <clazz>org.apache.beam.runners.flink.examples.WordCount</clazz>
@@ -95,11 +95,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-avro_2.10</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
             <artifactId>flink-clients_2.10</artifactId>
             <version>${flink.version}</version>
         </dependency>
@@ -116,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-avro</artifactId>
+            <artifactId>flink-avro_2.10</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f9d02c7/runners/flink/src/test/java/org/apache/beam/runners/flink/AvroITCase.java
----------------------------------------------------------------------
diff --git a/runners/flink/src/test/java/org/apache/beam/runners/flink/AvroITCase.java b/runners/flink/src/test/java/org/apache/beam/runners/flink/AvroITCase.java
index 5b32d54..3536f87 100644
--- a/runners/flink/src/test/java/org/apache/beam/runners/flink/AvroITCase.java
+++ b/runners/flink/src/test/java/org/apache/beam/runners/flink/AvroITCase.java
@@ -26,7 +26,6 @@ import com.google.cloud.dataflow.sdk.transforms.Create;
 import com.google.cloud.dataflow.sdk.transforms.DoFn;
 import com.google.cloud.dataflow.sdk.transforms.ParDo;
 import com.google.common.base.Joiner;
-import org.apache.flink.api.io.avro.example.User;
 import org.apache.flink.test.util.JavaProgramTestBase;
 
 
@@ -97,5 +96,32 @@ public class AvroITCase extends JavaProgramTestBase {
     p.run();
   }
 
+  private static class User {
+
+    private String name;
+    private int favoriteNumber;
+    private String favoriteColor;
+
+    public User() {}
+
+    public User(String name, int favoriteNumber, String favoriteColor) {
+      this.name = name;
+      this.favoriteNumber = favoriteNumber;
+      this.favoriteColor = favoriteColor;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public String getFavoriteColor() {
+      return favoriteColor;
+    }
+
+    public int getFavoriteNumber() {
+      return favoriteNumber;
+    }
+  }
+
 }
 


Mime
View raw message