You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/18 09:36:23 UTC
flink git commit: Revert "[FLINK-7058] Fix scala-2.10 dependencies"
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 <ch...@apache.org>
Authored: Tue Jul 18 11:23:27 2017 +0200
Committer: zentol <ch...@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>