Skip to content

Commit

Permalink
upgrade to Spark 1.3.1
Browse files Browse the repository at this point in the history
seems smooth, but a couple old jackson deps needed excluding

fixes #665
  • Loading branch information
ryan-williams committed Jun 1, 2015
1 parent 35fbbb6 commit 78b4f22
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<properties>
<java.version>1.7</java.version>
<avro.version>1.7.6</avro.version>
<spark.version>1.2.0</spark.version>
<spark.version>1.3.1</spark.version>
<parquet.version>1.6.0rc4</parquet.version>
<!-- Edit the following line to configure the Hadoop (HDFS) version. -->
<hadoop.version>2.2.0</hadoop.version>
Expand Down Expand Up @@ -473,6 +473,16 @@
<artifactId>aws-java-sdk</artifactId>
<version>1.7.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down

0 comments on commit 78b4f22

Please sign in to comment.