aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorPatrick Wendell <patrick@databricks.com>2015-02-04 22:39:44 -0800
committerPatrick Wendell <patrick@databricks.com>2015-02-04 22:39:44 -0800
commitc23ac03c8c27e840498a192b088e00b27076765f (patch)
tree002a9b905bee5b0f998c266650d0df9a32814aee /pom.xml
parent84acd08e0886aa23195f35837c15c09aa7804aff (diff)
downloadspark-c23ac03c8c27e840498a192b088e00b27076765f.tar.gz
spark-c23ac03c8c27e840498a192b088e00b27076765f.tar.bz2
spark-c23ac03c8c27e840498a192b088e00b27076765f.zip
SPARK-5607: Update to Kryo 2.24.0 to avoid including objenesis 1.2.
Our existing Kryo version actually embeds objenesis 1.2 classes in its jar, causing dependency conflicts during tests. This updates us to Kryo 2.24.0 (which was changed to not embed objenesis) to avoid this behavior. See the JIRA for more detail. Author: Patrick Wendell <patrick@databricks.com> Closes #4383 from pwendell/SPARK-5607 and squashes the following commits: c3b8d27 [Patrick Wendell] SPARK-5607: Update to Kryo 2.24.0 to avoid including objenesis 1.2.
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 55d82ad298..d324b5f0ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,7 @@
<jblas.version>1.2.3</jblas.version>
<jetty.version>8.1.14.v20131031</jetty.version>
<chill.version>0.5.0</chill.version>
+ <kryo.version>2.24.0</kryo.version>
<ivy.version>2.4.0</ivy.version>
<oro.version>2.0.8</oro.version>
<codahale.metrics.version>3.1.0</codahale.metrics.version>
@@ -340,7 +341,13 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- Bump kryo version (included via chill) due to SPARK-5607 -->
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <version>${kryo.version}</version>
+ </dependency>
+
<!-- Shaded deps marked as provided. These are promoted to compile scope
in the modules where we want the shaded classes to appear in the
associated jar. -->