From d7ba301bc1453764ce73b567b64dd80f3c3a1a8e Mon Sep 17 00:00:00 2001 From: "Jungtaek Lim (HeartSaVioR)" Date: Sat, 21 Mar 2020 19:10:23 -0700 Subject: [PATCH] [SPARK-31101][BUILD] Upgrade Janino to 3.0.16 This PR(SPARK-31101) proposes to upgrade Janino to 3.0.16 which is released recently. * Merged pull request janino-compiler/janino#114 "Grow the code for relocatables, and do fixup, and relocate". Please see the commit log. - https://github.com/janino-compiler/janino/commits/3.0.16 You can see the changelog from the link: http://janino-compiler.github.io/janino/changelog.html / though release note for Janino 3.0.16 is actually incorrect. We got some report on failure on user's query which Janino throws error on compiling generated code. The issue is here: janino-compiler/janino#113 It contains the information of generated code, symptom (error), and analysis of the bug, so please refer the link for more details. Janino 3.0.16 contains the PR janino-compiler/janino#114 which would enable Janino to succeed to compile user's query properly. No. Existing UTs. Closes #27932 from HeartSaVioR/SPARK-31101-janino-3.0.16. Authored-by: Jungtaek Lim (HeartSaVioR) Signed-off-by: Dongjoon Hyun --- dev/deps/spark-deps-hadoop-2.6 | 4 ++-- dev/deps/spark-deps-hadoop-2.7 | 4 ++-- dev/deps/spark-deps-hadoop-3.1 | 4 ++-- pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 77166deeac95c..0384a261b689e 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -33,7 +33,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar commons-cli/1.2//commons-cli-1.2.jar commons-codec/1.10//commons-codec-1.10.jar commons-collections/3.2.2//commons-collections-3.2.2.jar -commons-compiler/3.0.9//commons-compiler-3.0.9.jar +commons-compiler/3.0.16//commons-compiler-3.0.16.jar commons-compress/1.8.1//commons-compress-1.8.1.jar commons-configuration/1.6//commons-configuration-1.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar @@ -97,7 +97,7 @@ jackson-module-jaxb-annotations/2.6.7//jackson-module-jaxb-annotations-2.6.7.jar jackson-module-paranamer/2.7.9//jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11/2.6.7.1//jackson-module-scala_2.11-2.6.7.1.jar jackson-xc/1.9.13//jackson-xc-1.9.13.jar -janino/3.0.9//janino-3.0.9.jar +janino/3.0.16//janino-3.0.16.jar javassist/3.18.1-GA//javassist-3.18.1-GA.jar javax.annotation-api/1.2//javax.annotation-api-1.2.jar javax.inject/1//javax.inject-1.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 159e9b3b2ef1d..2927680ed4b1d 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -33,7 +33,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar commons-cli/1.2//commons-cli-1.2.jar commons-codec/1.10//commons-codec-1.10.jar commons-collections/3.2.2//commons-collections-3.2.2.jar -commons-compiler/3.0.9//commons-compiler-3.0.9.jar +commons-compiler/3.0.16//commons-compiler-3.0.16.jar commons-compress/1.8.1//commons-compress-1.8.1.jar commons-configuration/1.6//commons-configuration-1.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar @@ -97,7 +97,7 @@ jackson-module-jaxb-annotations/2.6.7//jackson-module-jaxb-annotations-2.6.7.jar jackson-module-paranamer/2.7.9//jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11/2.6.7.1//jackson-module-scala_2.11-2.6.7.1.jar jackson-xc/1.9.13//jackson-xc-1.9.13.jar -janino/3.0.9//janino-3.0.9.jar +janino/3.0.16//janino-3.0.16.jar javassist/3.18.1-GA//javassist-3.18.1-GA.jar javax.annotation-api/1.2//javax.annotation-api-1.2.jar javax.inject/1//javax.inject-1.jar diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index 0a8acf434e77f..aaf28b3d429df 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -31,7 +31,7 @@ commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar commons-cli/1.2//commons-cli-1.2.jar commons-codec/1.10//commons-codec-1.10.jar commons-collections/3.2.2//commons-collections-3.2.2.jar -commons-compiler/3.0.9//commons-compiler-3.0.9.jar +commons-compiler/3.0.16//commons-compiler-3.0.16.jar commons-compress/1.8.1//commons-compress-1.8.1.jar commons-configuration2/2.1.1//commons-configuration2-2.1.1.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar @@ -97,7 +97,7 @@ jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar jackson-module-jaxb-annotations/2.6.7//jackson-module-jaxb-annotations-2.6.7.jar jackson-module-paranamer/2.7.9//jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11/2.6.7.1//jackson-module-scala_2.11-2.6.7.1.jar -janino/3.0.9//janino-3.0.9.jar +janino/3.0.16//janino-3.0.16.jar javassist/3.18.1-GA//javassist-3.18.1-GA.jar javax.annotation-api/1.2//javax.annotation-api-1.2.jar javax.inject/1//javax.inject-1.jar diff --git a/pom.xml b/pom.xml index bf73696abc38e..9b9f4b6d839b4 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ 3.5 3.2.10 - 3.0.9 + 3.0.16 2.22.2 2.9.3 3.5.2