Return-Path: <commits-return-13460-archive-asf-public=cust-asf.ponee.io@flink.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 42D76200CC6
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 18 Jul 2017 11:36:25 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 414FD1669C8; Tue, 18 Jul 2017 09:36:25 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 877841669C6
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 18 Jul 2017 11:36:24 +0200 (CEST)
Received: (qmail 31441 invoked by uid 500); 18 Jul 2017 09:36:23 -0000
Mailing-List: contact commits-help@flink.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flink.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flink.apache.org>
List-Post: <mailto:commits@flink.apache.org>
List-Id: <commits.flink.apache.org>
Reply-To: dev@flink.apache.org
Delivered-To: mailing list commits@flink.apache.org
Received: (qmail 31432 invoked by uid 99); 18 Jul 2017 09:36:23 -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; Tue, 18 Jul 2017 09:36:23 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 9A34AE0468; Tue, 18 Jul 2017 09:36:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: chesnay@apache.org
To: commits@flink.apache.org
Message-Id: <457bc653ee414722a5ef84a683af19af@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: flink git commit: Revert "[FLINK-7058] Fix scala-2.10 dependencies"
Date: Tue, 18 Jul 2017 09:36:23 +0000 (UTC)
archived-at: Tue, 18 Jul 2017 09:36:25 -0000

Repository: flink
Updated Branches:
  refs/heads/release-1.3 9643af2b3 -> 7f110d133


Revert "[FLINK-7058] Fix scala-2.10 dependencies"

This reverts commit 09a4a4bdfb03887387d47f366193d1216a66257c.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7f110d13
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7f110d13
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7f110d13

Branch: refs/heads/release-1.3
Commit: 7f110d1331123d1584c6d0c294ed308bf1b797db
Parents: 9643af2
Author: zentol <chesnay@apache.org>
Authored: Tue Jul 18 11:23:27 2017 +0200
Committer: zentol <chesnay@apache.org>
Committed: Tue Jul 18 11:23:27 2017 +0200

----------------------------------------------------------------------
 flink-scala-shell/pom.xml | 6 +++---
 flink-scala/pom.xml       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7f110d13/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index 6c1f4a1..cf637d4 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -214,14 +214,14 @@ under the License.
 			<id>scala-2.10</id>
 			<activation>
 				<property>
-					<name>scala-2.10</name>
+					<!-- this is the default scala profile -->
+					<name>!scala-2.11</name>
 				</property>
 			</activation>
-			<!-- only required for Scala 2.10 -->
 			<dependencies>
 				<dependency>
 					<groupId>org.scalamacros</groupId>
-					<artifactId>quasiquotes_2.10</artifactId>
+					<artifactId>quasiquotes_${scala.binary.version}</artifactId>
 					<version>${scala.macros.version}</version>
 				</dependency>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/7f110d13/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 9047f62..be97795 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -251,14 +251,14 @@ under the License.
 			<id>scala-2.10</id>
 			<activation>
 				<property>
-					<name>scala-2.10</name>
+					<!-- this is the default scala profile -->
+					<name>!scala-2.11</name>
 				</property>
 			</activation>
-			<!-- only required for Scala 2.10 -->
 			<dependencies>
 				<dependency>
 					<groupId>org.scalamacros</groupId>
-					<artifactId>quasiquotes_2.10</artifactId>
+					<artifactId>quasiquotes_${scala.binary.version}</artifactId>
 					<version>${scala.macros.version}</version>
 				</dependency>
 			</dependencies>