Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3FF4219184 for ; Fri, 8 Apr 2016 23:35:42 +0000 (UTC) Received: (qmail 13286 invoked by uid 500); 8 Apr 2016 23:35:42 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 13182 invoked by uid 500); 8 Apr 2016 23:35:42 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 13173 invoked by uid 99); 8 Apr 2016 23:35:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Apr 2016 23:35:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D9393DFC13; Fri, 8 Apr 2016 23:35:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joshrosen@apache.org To: commits@spark.apache.org Message-Id: <56db4c8b96ba477981c5fda8bff6db33@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-11416][BUILD] Update to Chill 0.8.0 & Kryo 3.0.3 Date: Fri, 8 Apr 2016 23:35:41 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master 464a3c1e0 -> 906eef4c7 [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 Closes #12076 from JoshRosen/kryo3. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/906eef4c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/906eef4c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/906eef4c Branch: refs/heads/master Commit: 906eef4c7a380419f2d089262afdcf39454fe31e Parents: 464a3c1 Author: Josh Rosen Authored: Fri Apr 8 16:35:30 2016 -0700 Committer: Josh Rosen Committed: Fri Apr 8 16:35:30 2016 -0700 ---------------------------------------------------------------------- LICENSE | 5 ++--- dev/deps/spark-deps-hadoop-2.2 | 11 +++++------ dev/deps/spark-deps-hadoop-2.3 | 11 +++++------ dev/deps/spark-deps-hadoop-2.4 | 11 +++++------ dev/deps/spark-deps-hadoop-2.6 | 11 +++++------ dev/deps/spark-deps-hadoop-2.7 | 11 +++++------ pom.xml | 22 +--------------------- 7 files changed, 28 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 5a8c78b..9714b3b 100644 --- a/LICENSE +++ b/LICENSE @@ -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) http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/dev/deps/spark-deps-hadoop-2.2 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 2794b3d..023fba5 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 http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/dev/deps/spark-deps-hadoop-2.3 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 4906fe9..003c540 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 http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/dev/deps/spark-deps-hadoop-2.4 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 23ff5cf..80fbaea 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 http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/dev/deps/spark-deps-hadoop-2.6 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 9b5a564..b2c2a4c 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 http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/dev/deps/spark-deps-hadoop-2.7 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 1dca2fc..71e5188 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 http://git-wip-us.apache.org/repos/asf/spark/blob/906eef4c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f37a898..3f9e4ab 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ 1.6.0 8.1.14.v20131031 3.0.0.v201112011016 - 0.7.4 + 0.8.0 2.4.0 2.0.8 3.1.2 @@ -277,31 +277,11 @@ com.twitter chill_${scala.binary.version} ${chill.version} - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - com.twitter chill-java ${chill.version} - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - -