diff options
author | Josh Rosen <joshrosen@databricks.com> | 2016-04-08 16:35:30 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2016-04-08 16:35:30 -0700 |
commit | 906eef4c7a380419f2d089262afdcf39454fe31e (patch) | |
tree | e307962355e11c9a8bbb3b32518a37420992024e | |
parent | 464a3c1e02c665c7ad2709f8c47898b682526eb3 (diff) | |
download | spark-906eef4c7a380419f2d089262afdcf39454fe31e.tar.gz spark-906eef4c7a380419f2d089262afdcf39454fe31e.tar.bz2 spark-906eef4c7a380419f2d089262afdcf39454fe31e.zip |
[SPARK-11416][BUILD] Update to Chill 0.8.0 & Kryo 3.0.3
This patch upgrades Chill to 0.8.0 and Kryo to 3.0.3. While we'll likely need to bump these dependencies again before Spark 2.0 (due to SPARK-14221 / https://github.com/twitter/chill/issues/252), I wanted to get the bulk of the Kryo 2 -> Kryo 3 migration done now in order to figure out whether there are any unexpected surprises.
Author: Josh Rosen <joshrosen@databricks.com>
Closes #12076 from JoshRosen/kryo3.
-rw-r--r-- | LICENSE | 5 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.2 | 11 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.3 | 11 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.4 | 11 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.6 | 11 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.7 | 11 | ||||
-rw-r--r-- | pom.xml | 22 |
7 files changed, 28 insertions, 54 deletions
@@ -257,9 +257,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt. (BSD-style) scalacheck (org.scalacheck:scalacheck_2.11:1.10.0 - http://www.scalacheck.org) (BSD-style) spire (org.spire-math:spire_2.11:0.7.1 - http://spire-math.org) (BSD-style) spire-macros (org.spire-math:spire-macros_2.11:0.7.1 - http://spire-math.org) - (New BSD License) Kryo (com.esotericsoftware.kryo:kryo:2.21 - http://code.google.com/p/kryo/) - (New BSD License) MinLog (com.esotericsoftware.minlog:minlog:1.2 - http://code.google.com/p/minlog/) - (New BSD License) ReflectASM (com.esotericsoftware.reflectasm:reflectasm:1.07 - http://code.google.com/p/reflectasm/) + (New BSD License) Kryo (com.esotericsoftware:kryo:3.0.3 - https://github.com/EsotericSoftware/kryo) + (New BSD License) MinLog (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog) (New BSD license) Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf) (New BSD license) Protocol Buffer Java API (org.spark-project.protobuf:protobuf-java:2.4.1-shaded - http://code.google.com/p/protobuf) (The BSD License) Fortran to Java ARPACK (net.sourceforge.f2j:arpack_combined_all:0.1 - http://f2j.sourceforge.net) diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 2794b3d235..023fba5369 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -20,8 +20,8 @@ breeze_2.11-0.11.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar -chill-java-0.7.4.jar -chill_2.11-0.7.4.jar +chill-java-0.8.0.jar +chill_2.11-0.8.0.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar @@ -123,7 +123,7 @@ jsr305-1.3.9.jar jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar -kryo-2.21.jar +kryo-shaded-3.0.3.jar leveldbjni-all-1.8.jar libfb303-0.9.2.jar libthrift-0.9.2.jar @@ -136,10 +136,10 @@ metrics-core-3.1.2.jar metrics-graphite-3.1.2.jar metrics-json-3.1.2.jar metrics-jvm-3.1.2.jar -minlog-1.2.jar +minlog-1.3.0.jar netty-3.8.0.Final.jar netty-all-4.0.29.Final.jar -objenesis-1.2.jar +objenesis-2.1.jar opencsv-2.3.jar oro-2.0.8.jar paranamer-2.6.jar @@ -157,7 +157,6 @@ pmml-schema-1.2.7.jar protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar -reflectasm-1.07-shaded.jar scala-compiler-2.11.8.jar scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 4906fe9cfa..003c540d72 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -22,8 +22,8 @@ breeze_2.11-0.11.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar -chill-java-0.7.4.jar -chill_2.11-0.7.4.jar +chill-java-0.8.0.jar +chill_2.11-0.8.0.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar @@ -114,7 +114,7 @@ jsr305-1.3.9.jar jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar -kryo-2.21.jar +kryo-shaded-3.0.3.jar leveldbjni-all-1.8.jar libfb303-0.9.2.jar libthrift-0.9.2.jar @@ -126,11 +126,11 @@ metrics-core-3.1.2.jar metrics-graphite-3.1.2.jar metrics-json-3.1.2.jar metrics-jvm-3.1.2.jar -minlog-1.2.jar +minlog-1.3.0.jar mx4j-3.0.2.jar netty-3.8.0.Final.jar netty-all-4.0.29.Final.jar -objenesis-1.2.jar +objenesis-2.1.jar opencsv-2.3.jar oro-2.0.8.jar paranamer-2.6.jar @@ -148,7 +148,6 @@ pmml-schema-1.2.7.jar protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar -reflectasm-1.07-shaded.jar scala-compiler-2.11.8.jar scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 23ff5cfa2e..80fbaea222 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -22,8 +22,8 @@ breeze_2.11-0.11.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar -chill-java-0.7.4.jar -chill_2.11-0.7.4.jar +chill-java-0.8.0.jar +chill_2.11-0.8.0.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar @@ -115,7 +115,7 @@ jsr305-1.3.9.jar jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar -kryo-2.21.jar +kryo-shaded-3.0.3.jar leveldbjni-all-1.8.jar libfb303-0.9.2.jar libthrift-0.9.2.jar @@ -127,11 +127,11 @@ metrics-core-3.1.2.jar metrics-graphite-3.1.2.jar metrics-json-3.1.2.jar metrics-jvm-3.1.2.jar -minlog-1.2.jar +minlog-1.3.0.jar mx4j-3.0.2.jar netty-3.8.0.Final.jar netty-all-4.0.29.Final.jar -objenesis-1.2.jar +objenesis-2.1.jar opencsv-2.3.jar oro-2.0.8.jar paranamer-2.6.jar @@ -149,7 +149,6 @@ pmml-schema-1.2.7.jar protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar -reflectasm-1.07-shaded.jar scala-compiler-2.11.8.jar scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 9b5a5643f3..b2c2a4caec 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -26,8 +26,8 @@ breeze_2.11-0.11.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar -chill-java-0.7.4.jar -chill_2.11-0.7.4.jar +chill-java-0.8.0.jar +chill_2.11-0.8.0.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar @@ -121,7 +121,7 @@ jsr305-1.3.9.jar jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar -kryo-2.21.jar +kryo-shaded-3.0.3.jar leveldbjni-all-1.8.jar libfb303-0.9.2.jar libthrift-0.9.2.jar @@ -133,11 +133,11 @@ metrics-core-3.1.2.jar metrics-graphite-3.1.2.jar metrics-json-3.1.2.jar metrics-jvm-3.1.2.jar -minlog-1.2.jar +minlog-1.3.0.jar mx4j-3.0.2.jar netty-3.8.0.Final.jar netty-all-4.0.29.Final.jar -objenesis-1.2.jar +objenesis-2.1.jar opencsv-2.3.jar oro-2.0.8.jar paranamer-2.6.jar @@ -155,7 +155,6 @@ pmml-schema-1.2.7.jar protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar -reflectasm-1.07-shaded.jar scala-compiler-2.11.8.jar scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 1dca2fc55a..71e51883d5 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -26,8 +26,8 @@ breeze_2.11-0.11.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar -chill-java-0.7.4.jar -chill_2.11-0.7.4.jar +chill-java-0.8.0.jar +chill_2.11-0.8.0.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar @@ -122,7 +122,7 @@ jsr305-1.3.9.jar jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar -kryo-2.21.jar +kryo-shaded-3.0.3.jar leveldbjni-all-1.8.jar libfb303-0.9.2.jar libthrift-0.9.2.jar @@ -134,11 +134,11 @@ metrics-core-3.1.2.jar metrics-graphite-3.1.2.jar metrics-json-3.1.2.jar metrics-jvm-3.1.2.jar -minlog-1.2.jar +minlog-1.3.0.jar mx4j-3.0.2.jar netty-3.8.0.Final.jar netty-all-4.0.29.Final.jar -objenesis-1.2.jar +objenesis-2.1.jar opencsv-2.3.jar oro-2.0.8.jar paranamer-2.6.jar @@ -156,7 +156,6 @@ pmml-schema-1.2.7.jar protobuf-java-2.5.0.jar py4j-0.9.2.jar pyrolite-4.9.jar -reflectasm-1.07-shaded.jar scala-compiler-2.11.8.jar scala-library-2.11.8.jar scala-parser-combinators_2.11-1.0.4.jar @@ -139,7 +139,7 @@ <hive.parquet.version>1.6.0</hive.parquet.version> <jetty.version>8.1.14.v20131031</jetty.version> <orbit.version>3.0.0.v201112011016</orbit.version> - <chill.version>0.7.4</chill.version> + <chill.version>0.8.0</chill.version> <ivy.version>2.4.0</ivy.version> <oro.version>2.0.8</oro.version> <codahale.metrics.version>3.1.2</codahale.metrics.version> @@ -277,31 +277,11 @@ <groupId>com.twitter</groupId> <artifactId>chill_${scala.binary.version}</artifactId> <version>${chill.version}</version> - <exclusions> - <exclusion> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>chill-java</artifactId> <version>${chill.version}</version> - <exclusions> - <exclusion> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - </exclusion> - </exclusions> </dependency> <!-- This artifact is a shaded version of ASM 5.0.4. The POM that was used to produce this is at https://github.com/apache/geronimo-xbean/tree/xbean-4.4/xbean-asm5-shaded |