Repository: spark Updated Branches: refs/heads/master 2c1bfb497 -> fb54a564d
[SPARK-20433][BUILD] Bump jackson from 2.6.5 to 2.6.7.1 ## What changes were proposed in this pull request? Taking over https://github.com/apache/spark/pull/18789 ; Closes #18789 Update Jackson to 2.6.7 uniformly, and some components to 2.6.7.1, to get some fixes and prep for Scala 2.12 ## How was this patch tested? Existing tests Author: Sean Owen <so...@cloudera.com> Closes #18881 from srowen/SPARK-20433. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fb54a564 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fb54a564 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fb54a564 Branch: refs/heads/master Commit: fb54a564d75aea835f57bc147b83a76d1da0a01f Parents: 2c1bfb4 Author: Sean Owen <so...@cloudera.com> Authored: Tue Aug 8 18:15:29 2017 -0700 Committer: Marcelo Vanzin <van...@cloudera.com> Committed: Tue Aug 8 18:15:29 2017 -0700 ---------------------------------------------------------------------- dev/deps/spark-deps-hadoop-2.6 | 10 +++++----- dev/deps/spark-deps-hadoop-2.7 | 10 +++++----- pom.xml | 12 +++++++++--- sql/core/pom.xml | 1 - 4 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/fb54a564/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 76e3764..a41183a 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -86,14 +86,14 @@ htrace-core-3.0.4.jar httpclient-4.5.2.jar httpcore-4.4.4.jar ivy-2.4.0.jar -jackson-annotations-2.6.5.jar -jackson-core-2.6.5.jar +jackson-annotations-2.6.7.jar +jackson-core-2.6.7.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.6.5.jar +jackson-databind-2.6.7.1.jar jackson-jaxrs-1.9.13.jar jackson-mapper-asl-1.9.13.jar -jackson-module-paranamer-2.6.5.jar -jackson-module-scala_2.11-2.6.5.jar +jackson-module-paranamer-2.6.7.jar +jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar janino-3.0.0.jar java-xmlbuilder-1.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/fb54a564/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 f417347..5e1321b 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -86,14 +86,14 @@ htrace-core-3.1.0-incubating.jar httpclient-4.5.2.jar httpcore-4.4.4.jar ivy-2.4.0.jar -jackson-annotations-2.6.5.jar -jackson-core-2.6.5.jar +jackson-annotations-2.6.7.jar +jackson-core-2.6.7.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.6.5.jar +jackson-databind-2.6.7.1.jar jackson-jaxrs-1.9.13.jar jackson-mapper-asl-1.9.13.jar -jackson-module-paranamer-2.6.5.jar -jackson-module-scala_2.11-2.6.5.jar +jackson-module-paranamer-2.6.7.jar +jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar janino-3.0.0.jar java-xmlbuilder-1.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/fb54a564/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d54a9c4..95dd52a 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,8 @@ <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> - <fasterxml.jackson.version>2.6.5</fasterxml.jackson.version> + <fasterxml.jackson.version>2.6.7</fasterxml.jackson.version> + <fasterxml.jackson.databind.version>2.6.7.1</fasterxml.jackson.databind.version> <snappy.version>1.1.2.6</snappy.version> <netlib.java.version>1.1.2</netlib.java.version> <calcite.version>1.2.0-incubating</calcite.version> @@ -615,7 +616,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${fasterxml.jackson.version}</version> + <version>${fasterxml.jackson.databind.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -627,7 +628,7 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_${scala.binary.version}</artifactId> - <version>${fasterxml.jackson.version}</version> + <version>${fasterxml.jackson.databind.version}</version> <exclusions> <exclusion> <groupId>com.google.guava</groupId> @@ -637,6 +638,11 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-paranamer</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> <version>${fasterxml.jackson.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/fb54a564/sql/core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 25004e5..a16411e 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -101,7 +101,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${fasterxml.jackson.version}</version> </dependency> <dependency> <groupId>org.apache.arrow</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
