Skip to content

Commit

Permalink
#356 scala updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ruebot committed Nov 10, 2019
1 parent 8a51a87 commit 06764f7
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.name>${project.artifactId}</project.name>
<scala.version>2.12.10</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<hadoop.version>2.7.4</hadoop.version>
<spark.version>3.0.0-preview</spark.version>
<github.global.server>github</github.global.server>
Expand Down Expand Up @@ -134,9 +135,9 @@

<!-- for Scala -->
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.2.0</version>
<executions>
<execution>
<phase>process-resources</phase>
Expand All @@ -155,6 +156,8 @@
</executions>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
<checkMultipleScalaVersions>true</checkMultipleScalaVersions>
<failOnMultipleScalaVersions>true</failOnMultipleScalaVersions>
<sendJavaToScalac>true</sendJavaToScalac>
<args>
<arg>-target:jvm-1.8</arg>
Expand Down Expand Up @@ -393,11 +396,13 @@
</configuration>
</plugin>

<!--
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.3.2</version>
<version>4.2.0</version>
</plugin>
-->

<plugin>
<artifactId>maven-jxr-plugin</artifactId>
Expand Down Expand Up @@ -472,7 +477,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.12</artifactId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>3.0.8</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -565,17 +570,17 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.12</artifactId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.12</artifactId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-graphx_2.12</artifactId>
<artifactId>spark-graphx_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -637,7 +642,7 @@
</dependency>
<dependency>
<groupId>org.rogach</groupId>
<artifactId>scallop_2.12</artifactId>
<artifactId>scallop_${scala.binary.version}</artifactId>
<version>3.3.1</version>
</dependency>
<dependency> <!-- needed for running boilerpipe, but will compile without -->
Expand Down Expand Up @@ -666,7 +671,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.3</version>
<version>2.10.5</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
Expand Down

0 comments on commit 06764f7

Please sign in to comment.