You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2014/11/05 13:52:14 UTC
[2/3] git commit: [scala] Add macroparadise to enable Quasiquotes
[scala] Add macroparadise to enable Quasiquotes
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/1e1df6d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/1e1df6d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/1e1df6d5
Branch: refs/heads/master
Commit: 1e1df6d562b116f977bb0e837687ec5eb616ece2
Parents: 3510bf9
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Wed Oct 22 11:35:15 2014 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed Nov 5 12:34:56 2014 +0100
----------------------------------------------------------------------
flink-scala/pom.xml | 19 ++++++++++++++++---
pom.xml | 3 +++
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1e1df6d5/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 6083dac..d67afc8 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -54,19 +54,25 @@ under the License.
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>2.10.4</version>
+ <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.10.4</version>
+ <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>2.10.4</version>
+ <version>${scala.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ <version>${scala.macros.version}</version>
</dependency>
<dependency>
@@ -125,6 +131,13 @@ under the License.
<jvmArg>-Xms128m</jvmArg>
<jvmArg>-Xmx512m</jvmArg>
</jvmArgs>
+ <compilerPlugins>
+ <compilerPlugin>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>paradise_${scala.version}</artifactId>
+ <version>${scala.macros.version}</version>
+ </compilerPlugin>
+ </compilerPlugins>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1e1df6d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60e87da..2547279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,9 @@ under the License.
<flink.reuseForks>true</flink.reuseForks>
<slf4j.version>1.7.7</slf4j.version>
<guava.version>17.0</guava.version>
+ <scala.version>2.10.4</scala.version>
+ <scala.binary.version>2.10</scala.binary.version>
+ <scala.macros.version>2.0.1</scala.macros.version>
</properties>
<dependencies>