spark git commit: Revert "[SPARK-11753][SQL][TEST-HADOOP2.2] Make allowNonNumericNumbers option work

2016-05-31 Thread zsxwing 
Repository: spark
Updated Branches:
  refs/heads/master c6de5832b -> 9a74de18a


Revert "[SPARK-11753][SQL][TEST-HADOOP2.2] Make allowNonNumericNumbers option 
work

## What changes were proposed in this pull request?

This reverts commit c24b6b679c3efa053f7de19be73eb36dc70d9930. Sent a PR to run 
Jenkins tests due to the revert conflicts of `dev/deps/spark-deps-hadoop*`.

## How was this patch tested?

Jenkins unit tests, integration tests, manual tests)

Author: Shixiong Zhu 

Closes #13417 from zsxwing/revert-SPARK-11753.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9a74de18
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9a74de18
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9a74de18

Branch: refs/heads/master
Commit: 9a74de18a13d84805e1a448f858bb05ce30de87e
Parents: c6de583
Author: Shixiong Zhu 
Authored: Tue May 31 14:50:07 2016 -0700
Committer: Shixiong Zhu 
Committed: Tue May 31 14:50:07 2016 -0700

--
 dev/deps/spark-deps-hadoop-2.2  | 12 ++--
 dev/deps/spark-deps-hadoop-2.3  | 12 ++--
 dev/deps/spark-deps-hadoop-2.4  | 12 ++--
 dev/deps/spark-deps-hadoop-2.6  | 12 ++--
 dev/deps/spark-deps-hadoop-2.7  | 12 ++--
 pom.xml |  8 +--
 python/pyspark/sql/readwriter.py|  3 -
 .../org/apache/spark/sql/DataFrameReader.scala  |  2 -
 .../datasources/json/JacksonParser.scala| 28 --
 .../json/JsonParsingOptionsSuite.scala  | 59 +---
 10 files changed, 58 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/9a74de18/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 deec033..b5c38a6 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -72,13 +72,13 @@ hk2-utils-2.4.0-b34.jar
 httpclient-4.5.2.jar
 httpcore-4.4.4.jar
 ivy-2.4.0.jar
-jackson-annotations-2.7.3.jar
-jackson-core-2.7.3.jar
+jackson-annotations-2.6.5.jar
+jackson-core-2.6.5.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.7.3.jar
+jackson-databind-2.6.5.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-paranamer-2.7.3.jar
-jackson-module-scala_2.11-2.7.3.jar
+jackson-module-paranamer-2.6.5.jar
+jackson-module-scala_2.11-2.6.5.jar
 janino-2.7.8.jar
 javassist-3.18.1-GA.jar
 javax.annotation-api-1.2.jar
@@ -128,7 +128,7 @@ objenesis-2.1.jar
 opencsv-2.3.jar
 oro-2.0.8.jar
 osgi-resource-locator-1.0.1.jar
-paranamer-2.8.jar
+paranamer-2.3.jar
 parquet-column-1.8.1.jar
 parquet-common-1.8.1.jar
 parquet-encoding-1.8.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/9a74de18/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 43c7dd3..969df04 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -74,13 +74,13 @@ hk2-utils-2.4.0-b34.jar
 httpclient-4.5.2.jar
 httpcore-4.4.4.jar
 ivy-2.4.0.jar
-jackson-annotations-2.7.3.jar
-jackson-core-2.7.3.jar
+jackson-annotations-2.6.5.jar
+jackson-core-2.6.5.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.7.3.jar
+jackson-databind-2.6.5.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-paranamer-2.7.3.jar
-jackson-module-scala_2.11-2.7.3.jar
+jackson-module-paranamer-2.6.5.jar
+jackson-module-scala_2.11-2.6.5.jar
 janino-2.7.8.jar
 java-xmlbuilder-1.0.jar
 javassist-3.18.1-GA.jar
@@ -135,7 +135,7 @@ objenesis-2.1.jar
 opencsv-2.3.jar
 oro-2.0.8.jar
 osgi-resource-locator-1.0.1.jar
-paranamer-2.8.jar
+paranamer-2.3.jar
 parquet-column-1.8.1.jar
 parquet-common-1.8.1.jar
 parquet-encoding-1.8.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/9a74de18/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 7186b30..f0491ec 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -74,13 +74,13 @@ hk2-utils-2.4.0-b34.jar
 httpclient-4.5.2.jar
 httpcore-4.4.4.jar
 ivy-2.4.0.jar
-jackson-annotations-2.7.3.jar
-jackson-core-2.7.3.jar
+jackson-annotations-2.6.5.jar
+jackson-core-2.6.5.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.7.3.jar
+jackson-databind-2.6.5.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-paranamer-2.7.3.jar
-jackson-module-scala_2.11-2.7.3.jar
+jackson-module-paranamer-2.6.5.jar
+jackson-module-scala_2.11-2.6.5.jar
 janino-2.7.8.jar
 java-xmlbuilder-1.0.jar
 javassist-3.18.1-GA.jar
@@

spark git commit: Revert "[SPARK-11753][SQL][TEST-HADOOP2.2] Make allowNonNumericNumbers option work

2016-05-31 Thread zsxwing 
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 45472f8e0 -> 20a07e443


Revert "[SPARK-11753][SQL][TEST-HADOOP2.2] Make allowNonNumericNumbers option 
work

## What changes were proposed in this pull request?

This reverts commit c24b6b679c3efa053f7de19be73eb36dc70d9930. Sent a PR to run 
Jenkins tests due to the revert conflicts of `dev/deps/spark-deps-hadoop*`.

## How was this patch tested?

Jenkins unit tests, integration tests, manual tests)

Author: Shixiong Zhu 

Closes #13417 from zsxwing/revert-SPARK-11753.

(cherry picked from commit 9a74de18a13d84805e1a448f858bb05ce30de87e)
Signed-off-by: Shixiong Zhu 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/20a07e44
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/20a07e44
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/20a07e44

Branch: refs/heads/branch-2.0
Commit: 20a07e443bbb4c6cfa03423a2bccfb626cb87a67
Parents: 45472f8
Author: Shixiong Zhu 
Authored: Tue May 31 14:50:07 2016 -0700
Committer: Shixiong Zhu 
Committed: Tue May 31 14:50:16 2016 -0700

--
 dev/deps/spark-deps-hadoop-2.2  | 12 ++--
 dev/deps/spark-deps-hadoop-2.3  | 12 ++--
 dev/deps/spark-deps-hadoop-2.4  | 12 ++--
 dev/deps/spark-deps-hadoop-2.6  | 12 ++--
 dev/deps/spark-deps-hadoop-2.7  | 12 ++--
 pom.xml |  8 +--
 python/pyspark/sql/readwriter.py|  3 -
 .../org/apache/spark/sql/DataFrameReader.scala  |  2 -
 .../datasources/json/JacksonParser.scala| 28 --
 .../json/JsonParsingOptionsSuite.scala  | 59 +---
 10 files changed, 58 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/20a07e44/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 deec033..b5c38a6 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -72,13 +72,13 @@ hk2-utils-2.4.0-b34.jar
 httpclient-4.5.2.jar
 httpcore-4.4.4.jar
 ivy-2.4.0.jar
-jackson-annotations-2.7.3.jar
-jackson-core-2.7.3.jar
+jackson-annotations-2.6.5.jar
+jackson-core-2.6.5.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.7.3.jar
+jackson-databind-2.6.5.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-paranamer-2.7.3.jar
-jackson-module-scala_2.11-2.7.3.jar
+jackson-module-paranamer-2.6.5.jar
+jackson-module-scala_2.11-2.6.5.jar
 janino-2.7.8.jar
 javassist-3.18.1-GA.jar
 javax.annotation-api-1.2.jar
@@ -128,7 +128,7 @@ objenesis-2.1.jar
 opencsv-2.3.jar
 oro-2.0.8.jar
 osgi-resource-locator-1.0.1.jar
-paranamer-2.8.jar
+paranamer-2.3.jar
 parquet-column-1.8.1.jar
 parquet-common-1.8.1.jar
 parquet-encoding-1.8.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/20a07e44/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 43c7dd3..969df04 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -74,13 +74,13 @@ hk2-utils-2.4.0-b34.jar
 httpclient-4.5.2.jar
 httpcore-4.4.4.jar
 ivy-2.4.0.jar
-jackson-annotations-2.7.3.jar
-jackson-core-2.7.3.jar
+jackson-annotations-2.6.5.jar
+jackson-core-2.6.5.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.7.3.jar
+jackson-databind-2.6.5.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-paranamer-2.7.3.jar
-jackson-module-scala_2.11-2.7.3.jar
+jackson-module-paranamer-2.6.5.jar
+jackson-module-scala_2.11-2.6.5.jar
 janino-2.7.8.jar
 java-xmlbuilder-1.0.jar
 javassist-3.18.1-GA.jar
@@ -135,7 +135,7 @@ objenesis-2.1.jar
 opencsv-2.3.jar
 oro-2.0.8.jar
 osgi-resource-locator-1.0.1.jar
-paranamer-2.8.jar
+paranamer-2.3.jar
 parquet-column-1.8.1.jar
 parquet-common-1.8.1.jar
 parquet-encoding-1.8.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/20a07e44/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 7186b30..f0491ec 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -74,13 +74,13 @@ hk2-utils-2.4.0-b34.jar
 httpclient-4.5.2.jar
 httpcore-4.4.4.jar
 ivy-2.4.0.jar
-jackson-annotations-2.7.3.jar
-jackson-core-2.7.3.jar
+jackson-annotations-2.6.5.jar
+jackson-core-2.6.5.jar
 jackson-core-asl-1.9.13.jar
-jackson-databind-2.7.3.jar
+jackson-databind-2.6.5.jar
 jackson-mapper-asl-1.9.13.jar
-jackson-module-paranamer-2.7.3.jar
-jackson-module-scala_2.11-2.7.3.jar