Return-Path: X-Original-To: apmail-beam-commits-archive@minotaur.apache.org Delivered-To: apmail-beam-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58BFC1859C for ; Fri, 11 Mar 2016 10:34:55 +0000 (UTC) Received: (qmail 23018 invoked by uid 500); 11 Mar 2016 10:34:55 -0000 Delivered-To: apmail-beam-commits-archive@beam.apache.org Received: (qmail 22967 invoked by uid 500); 11 Mar 2016 10:34:55 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 22958 invoked by uid 99); 11 Mar 2016 10:34:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2016 10:34:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id CDD2C1A121E for ; Fri, 11 Mar 2016 10:34:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id RhlLuUc82s-f for ; Fri, 11 Mar 2016 10:34:53 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 787595FB21 for ; Fri, 11 Mar 2016 10:34:52 +0000 (UTC) Received: (qmail 22919 invoked by uid 99); 11 Mar 2016 10:34:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2016 10:34:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BD0FDFAB5; Fri, 11 Mar 2016 10:34:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mxm@apache.org To: commits@beam.incubator.apache.org Message-Id: <1284b9b119094e1e9289cd31417dd0d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-beam git commit: [BEAM-107] [flink] support multiple Scala versions Date: Fri, 11 Mar 2016 10:34:51 +0000 (UTC) Repository: incubator-beam Updated Branches: refs/heads/master de91b8014 -> 45309caec [BEAM-107] [flink] support multiple Scala versions - introduces a Maven property to support different Scala major versions Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/45309cae Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/45309cae Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/45309cae Branch: refs/heads/master Commit: 45309caec4da583ea7a3f92dd33ed1133754dffc Parents: de91b80 Author: Maximilian Michels Authored: Fri Mar 11 11:19:58 2016 +0100 Committer: Maximilian Michels Committed: Fri Mar 11 11:31:07 2016 +0100 ---------------------------------------------------------------------- runners/flink/pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/45309cae/runners/flink/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml index 9bd705c..b1929d2 100644 --- a/runners/flink/pom.xml +++ b/runners/flink/pom.xml @@ -49,6 +49,7 @@ UTF-8 1.0.0 1.5.0-SNAPSHOT + 2.10 org.apache.beam.runners.flink.examples.WordCount kinglear.txt @@ -78,12 +79,12 @@ org.apache.flink - flink-streaming-java_2.10 + flink-streaming-java_${scala.major.version} ${flink.version} org.apache.flink - flink-streaming-java_2.10 + flink-streaming-java_${scala.major.version} ${flink.version} test test-jar @@ -95,23 +96,23 @@ org.apache.flink - flink-clients_2.10 + flink-clients_${scala.major.version} ${flink.version} org.apache.flink - flink-test-utils_2.10 + flink-test-utils_${scala.major.version} ${flink.version} test org.apache.flink - flink-connector-kafka-0.8_2.10 + flink-connector-kafka-0.8_${scala.major.version} ${flink.version} org.apache.flink - flink-avro_2.10 + flink-avro_${scala.major.version} ${flink.version}