Skip to content
Snippets Groups Projects
Commit 69297c64 authored by Thomas Dudziak's avatar Thomas Dudziak
Browse files

Addressed code review comments

parent 24e1e425
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>0.6.1-SNAPSHOT</version> <version>0.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>0.6.1-SNAPSHOT</version> <version>0.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>0.6.1-SNAPSHOT</version> <version>0.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
......
...@@ -48,7 +48,9 @@ ...@@ -48,7 +48,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.6</java.version>
<scala.version>2.9.2</scala.version> <scala.version>2.9.2</scala.version>
<mesos.version>0.9.0-incubating</mesos.version>
<akka.version>2.0.3</akka.version> <akka.version>2.0.3</akka.version>
<spray.version>1.0-M2.1</spray.version> <spray.version>1.0-M2.1</spray.version>
<slf4j.version>1.6.1</slf4j.version> <slf4j.version>1.6.1</slf4j.version>
...@@ -228,11 +230,10 @@ ...@@ -228,11 +230,10 @@
<artifactId>scala-io-file_${scala.version}</artifactId> <artifactId>scala-io-file_${scala.version}</artifactId>
<version>0.4.1</version> <version>0.4.1</version>
</dependency> </dependency>
<!-- In the root dir: mvn install:install-file -Dfile=core/lib/mesos-0.9.0.jar -DgroupId=org.apache.mesos -DartifactId=mesos -Dversion=0.9.0 -Dpackaging=jar -->
<dependency> <dependency>
<groupId>org.apache.mesos</groupId> <groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId> <artifactId>mesos</artifactId>
<version>0.9.0</version> <version>${mesos.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -286,7 +287,7 @@ ...@@ -286,7 +287,7 @@
<version>3.0.0</version> <version>3.0.0</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>1.6</version> <version>${java.version}</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
...@@ -301,7 +302,7 @@ ...@@ -301,7 +302,7 @@
<plugin> <plugin>
<groupId>org.tomdz.twirl</groupId> <groupId>org.tomdz.twirl</groupId>
<artifactId>twirl-maven-plugin</artifactId> <artifactId>twirl-maven-plugin</artifactId>
<version>1.0.0</version> <version>1.0.1</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
...@@ -348,6 +349,12 @@ ...@@ -348,6 +349,12 @@
<jvmArg>-Xms64m</jvmArg> <jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx1024m</jvmArg> <jvmArg>-Xmx1024m</jvmArg>
</jvmArgs> </jvmArgs>
<javacArgs>
<javacArg>-source</javacArg>
<javacArg>${java.version}</javacArg>
<javacArg>-target</javacArg>
<javacArg>${java.version}</javacArg>
</javacArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -355,8 +362,8 @@ ...@@ -355,8 +362,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>${java.version}</source>
<target>1.6</target> <target>${java.version}</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<maxmem>1024m</maxmem> <maxmem>1024m</maxmem>
</configuration> </configuration>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>0.6.1-SNAPSHOT</version> <version>0.6.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment