From 5965446f16fc0ba512bd2eeb03c6ed2c3e3faa56 Mon Sep 17 00:00:00 2001
From: "Jungtaek Lim (HeartSaVioR)" <kabhwan.opensource@gmail.com>
Date: Thu, 19 Mar 2020 10:11:45 +0900
Subject: [PATCH] Upgrade to Janino 3.1.2, remove hack around using Jitpack

---
 dev/deps/spark-deps-hadoop-2.7-hive-1.2 |  4 ++--
 dev/deps/spark-deps-hadoop-2.7-hive-2.3 |  4 ++--
 dev/deps/spark-deps-hadoop-3.2-hive-2.3 |  4 ++--
 pom.xml                                 | 20 +++-----------------
 project/SparkBuild.scala                |  1 -
 sql/catalyst/pom.xml                    |  5 ++---
 6 files changed, 11 insertions(+), 27 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 5eb2b0df9add0..be22d8af33520 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-1.2
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-1.2
@@ -35,7 +35,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/SPARK-31101-3.1.x-v3//commons-compiler-SPARK-31101-3.1.x-v3.jar
+commons-compiler/3.1.2//commons-compiler-3.1.2.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
@@ -105,7 +105,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
 jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
 jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
 jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
-janino/SPARK-31101-3.1.x-v3//janino-SPARK-31101-3.1.x-v3.jar
+janino/3.1.2//janino-3.1.2.jar
 javassist/3.25.0-GA//javassist-3.25.0-GA.jar
 javax.inject/1//javax.inject-1.jar
 javax.servlet-api/3.1.0//javax.servlet-api-3.1.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 6cae779c38ac6..67f4a10bef198 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -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/SPARK-31101-3.1.x-v3//commons-compiler-SPARK-31101-3.1.x-v3.jar
+commons-compiler/3.1.2//commons-compiler-3.1.2.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
@@ -118,7 +118,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
 jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
 jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
 jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
-janino/SPARK-31101-3.1.x-v3//janino-SPARK-31101-3.1.x-v3.jar
+janino/3.1.2//janino-3.1.2.jar
 javassist/3.25.0-GA//javassist-3.25.0-GA.jar
 javax.inject/1//javax.inject-1.jar
 javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index 286e114671bdf..40b9ed196e439 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -30,7 +30,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/SPARK-31101-3.1.x-v3//commons-compiler-SPARK-31101-3.1.x-v3.jar
+commons-compiler/3.1.2//commons-compiler-3.1.2.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
@@ -117,7 +117,7 @@ jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
 jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
 jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
 jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
-janino/SPARK-31101-3.1.x-v3//janino-SPARK-31101-3.1.x-v3.jar
+janino/3.1.2//janino-3.1.2.jar
 javassist/3.25.0-GA//javassist-3.25.0-GA.jar
 javax.inject/1//javax.inject-1.jar
 javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
diff --git a/pom.xml b/pom.xml
index eded4b3e3f728..90b93655c32fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,8 +178,7 @@
     <!-- org.apache.commons/commons-pool2/-->
     <commons-pool2.version>2.6.2</commons-pool2.version>
     <datanucleus-core.version>4.1.17</datanucleus-core.version>
-    <!-- FIXME: testing unreleased version of Janino via JitPack... -->
-    <janino.version>SPARK-31101-3.1.x-v3</janino.version>
+    <janino.version>3.1.2</janino.version>
     <jersey.version>2.30</jersey.version>
     <joda.version>2.10.5</joda.version>
     <jodd.version>3.5.2</jodd.version>
@@ -247,18 +246,6 @@
     <CodeCacheSize>1g</CodeCacheSize>
   </properties>
   <repositories>
-    <!-- FIXME: testing unreleased version of Janino via JitPack... -->
-    <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-
     <repository>
       <id>gcs-maven-central-mirror</id>
       <!--
@@ -2183,14 +2170,13 @@
         <version>${hive.parquet.version}</version>
         <scope>${hive.parquet.scope}</scope>
       </dependency>
-      <!-- FIXME: testing unreleased version of Janino via JitPack... -->
       <dependency>
-        <groupId>com.github.heartsavior.janino</groupId>
+        <groupId>org.codehaus.janino</groupId>
         <artifactId>janino</artifactId>
         <version>${janino.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.github.heartsavior.janino</groupId>
+        <groupId>org.codehaus.janino</groupId>
         <artifactId>commons-compiler</artifactId>
         <version>${janino.version}</version>
       </dependency>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8dc13972252b9..b606bdd649d66 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -229,7 +229,6 @@ object SparkBuild extends PomBuild {
       "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/",
       DefaultMavenRepository,
       Resolver.mavenLocal,
-      "jitpack" at "https://jitpack.io",
       Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),
     externalResolvers := resolvers.value,
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index 4cbaf3769b501..9edbb7fec97d0 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -92,13 +92,12 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- FIXME: testing unreleased version of Janino via JitPack... -->
     <dependency>
-      <groupId>com.github.heartsavior.janino</groupId>
+      <groupId>org.codehaus.janino</groupId>
       <artifactId>janino</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.github.heartsavior.janino</groupId>
+      <groupId>org.codehaus.janino</groupId>
       <artifactId>commons-compiler</artifactId>
     </dependency>
     <dependency>