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 18:59:02 UTC
[7/9] flink git commit: [FLINK-7058] Fix scala-2.10 dependencies
[FLINK-7058] Fix scala-2.10 dependencies
This closes #4240.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8b59b4fc
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8b59b4fc
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8b59b4fc
Branch: refs/heads/master
Commit: 8b59b4fcafba331dc03ef661919b497d845193aa
Parents: afb85f5
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Fri Jun 30 18:19:59 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Tue Jul 18 17:03:14 2017 +0200
----------------------------------------------------------------------
flink-scala-shell/pom.xml | 4 ++--
flink-scala/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8b59b4fc/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index c9acbec..0d925ed 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -214,10 +214,10 @@ under the License.
<id>scala-2.10</id>
<activation>
<property>
- <!-- only required for Scala 2.10 -->
- <name>!scala-2.11</name>
+ <name>scala-2.10</name>
</property>
</activation>
+ <!-- only required for Scala 2.10 -->
<dependencies>
<dependency>
<groupId>org.scalamacros</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/8b59b4fc/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 32581a6..fd73253 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -251,10 +251,10 @@ under the License.
<id>scala-2.10</id>
<activation>
<property>
- <!-- only required for Scala 2.10 -->
- <name>!scala-2.11</name>
+ <name>scala-2.10</name>
</property>
</activation>
+ <!-- only required for Scala 2.10 -->
<dependencies>
<dependency>
<groupId>org.scalamacros</groupId>