You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2020/03/03 15:28:34 UTC

[spark] branch branch-3.0 updated: [SPARK-30994][CORE] Update xerces to 2.12.0

This is an automated email from the ASF dual-hosted git repository.

srowen pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 591bfd9  [SPARK-30994][CORE] Update xerces to 2.12.0
591bfd9 is described below

commit 591bfd9466887fd41112945343722b573dc90a5b
Author: Sean Owen <sr...@gmail.com>
AuthorDate: Tue Mar 3 09:27:18 2020 -0600

    [SPARK-30994][CORE] Update xerces to 2.12.0
    
    ### What changes were proposed in this pull request?
    
    Manage up the version of Xerces that Hadoop uses (and potentially user apps) to 2.12.0 to match https://issues.apache.org/jira/browse/HADOOP-16530
    
    ### Why are the changes needed?
    
    Picks up bug and security fixes: https://www.xml.com/news/2018-05-apache-xerces-j-2120/
    
    ### Does this PR introduce any user-facing change?
    
    Should be no behavior changes.
    
    ### How was this patch tested?
    
    Existing tests.
    
    Closes #27746 from srowen/SPARK-30994.
    
    Authored-by: Sean Owen <sr...@gmail.com>
    Signed-off-by: Sean Owen <sr...@gmail.com>
    (cherry picked from commit 97d9a22b04cc831b7de19db735154c69f696773c)
    Signed-off-by: Sean Owen <sr...@gmail.com>
---
 dev/deps/spark-deps-hadoop-2.7-hive-1.2 | 2 +-
 dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 2 +-
 pom.xml                                 | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-1.2 b/dev/deps/spark-deps-hadoop-2.7-hive-1.2
index 113b7d7..364b825 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-1.2
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-1.2
@@ -201,7 +201,7 @@ super-csv/2.2.0//super-csv-2.2.0.jar
 threeten-extra/1.5.0//threeten-extra-1.5.0.jar
 univocity-parsers/2.8.3//univocity-parsers-2.8.3.jar
 xbean-asm7-shaded/4.15//xbean-asm7-shaded-4.15.jar
-xercesImpl/2.9.1//xercesImpl-2.9.1.jar
+xercesImpl/2.12.0//xercesImpl-2.12.0.jar
 xmlenc/0.52//xmlenc-0.52.jar
 xz/1.5//xz-1.5.jar
 zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
index 7b7423a..62d1436 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -215,7 +215,7 @@ transaction-api/1.1//transaction-api-1.1.jar
 univocity-parsers/2.8.3//univocity-parsers-2.8.3.jar
 velocity/1.5//velocity-1.5.jar
 xbean-asm7-shaded/4.15//xbean-asm7-shaded-4.15.jar
-xercesImpl/2.9.1//xercesImpl-2.9.1.jar
+xercesImpl/2.12.0//xercesImpl-2.12.0.jar
 xmlenc/0.52//xmlenc-0.52.jar
 xz/1.5//xz-1.5.jar
 zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
diff --git a/pom.xml b/pom.xml
index 9d36faf..f98d132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1083,6 +1083,12 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <!-- Managed up to match Hadoop in HADOOP-16530 -->
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.12.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org