flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ches...@apache.org
Subject [1/2] flink git commit: [FLINK-7058] Fix scala-2.10 dependencies
Date Mon, 17 Jul 2017 19:15:17 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.3 4b003eafd -> 3c0f38369


[FLINK-7058] Fix scala-2.10 dependencies


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

Branch: refs/heads/release-1.3
Commit: 09a4a4bdfb03887387d47f366193d1216a66257c
Parents: 4b003ea
Author: Piotr Nowojski <piotr.nowojski@gmail.com>
Authored: Fri Jun 30 18:19:59 2017 +0200
Committer: zentol <chesnay@apache.org>
Committed: Mon Jul 17 21:11:13 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/09a4a4bd/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index cf637d4..6c1f4a1 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>
-					<!-- this is the default scala profile -->
-					<name>!scala-2.11</name>
+					<name>scala-2.10</name>
 				</property>
 			</activation>
+			<!-- only required for Scala 2.10 -->
 			<dependencies>
 				<dependency>
 					<groupId>org.scalamacros</groupId>
-					<artifactId>quasiquotes_${scala.binary.version}</artifactId>
+					<artifactId>quasiquotes_2.10</artifactId>
 					<version>${scala.macros.version}</version>
 				</dependency>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/09a4a4bd/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index be97795..9047f62 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>
-					<!-- this is the default scala profile -->
-					<name>!scala-2.11</name>
+					<name>scala-2.10</name>
 				</property>
 			</activation>
+			<!-- only required for Scala 2.10 -->
 			<dependencies>
 				<dependency>
 					<groupId>org.scalamacros</groupId>
-					<artifactId>quasiquotes_${scala.binary.version}</artifactId>
+					<artifactId>quasiquotes_2.10</artifactId>
 					<version>${scala.macros.version}</version>
 				</dependency>
 			</dependencies>


Mime
View raw message