Bump Hive 2.3.102 and exclude javax.servlet

apache · Mar 4, 2024 · 8591dbd · 8591dbd
1 parent b3a91dd
commit 8591dbd
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 46 deletions.
diff --git a/connector/connect/server/pom.xml b/connector/connect/server/pom.xml
@@ -160,10 +160,6 @@
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -166,10 +166,6 @@
       <artifactId>jetty-servlets</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -83,19 +83,19 @@ hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar
 hadoop-cloud-storage/3.3.6//hadoop-cloud-storage-3.3.6.jar
 hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar
 hadoop-yarn-server-web-proxy/3.3.6//hadoop-yarn-server-web-proxy-3.3.6.jar
-hive-beeline/2.3.101//hive-beeline-2.3.101.jar
-hive-cli/2.3.101//hive-cli-2.3.101.jar
-hive-common/2.3.101//hive-common-2.3.101.jar
-hive-exec/2.3.101/core/hive-exec-2.3.101-core.jar
-hive-jdbc/2.3.101//hive-jdbc-2.3.101.jar
-hive-llap-common/2.3.101//hive-llap-common-2.3.101.jar
-hive-metastore/2.3.101//hive-metastore-2.3.101.jar
-hive-serde/2.3.101//hive-serde-2.3.101.jar
+hive-beeline/2.3.102//hive-beeline-2.3.102.jar
+hive-cli/2.3.102//hive-cli-2.3.102.jar
+hive-common/2.3.102//hive-common-2.3.102.jar
+hive-exec/2.3.102/core/hive-exec-2.3.102-core.jar
+hive-jdbc/2.3.102//hive-jdbc-2.3.102.jar
+hive-llap-common/2.3.102//hive-llap-common-2.3.102.jar
+hive-metastore/2.3.102//hive-metastore-2.3.102.jar
+hive-serde/2.3.102//hive-serde-2.3.102.jar
 hive-service-rpc/3.1.3//hive-service-rpc-3.1.3.jar
-hive-shims-0.23/2.3.101//hive-shims-0.23-2.3.101.jar
-hive-shims-common/2.3.101//hive-shims-common-2.3.101.jar
-hive-shims-scheduler/2.3.101//hive-shims-scheduler-2.3.101.jar
-hive-shims/2.3.101//hive-shims-2.3.101.jar
+hive-shims-0.23/2.3.102//hive-shims-0.23-2.3.102.jar
+hive-shims-common/2.3.102//hive-shims-common-2.3.102.jar
+hive-shims-scheduler/2.3.102//hive-shims-scheduler-2.3.102.jar
+hive-shims/2.3.102//hive-shims-2.3.102.jar
 hive-storage-api/2.8.1//hive-storage-api-2.8.1.jar
 hk2-api/3.0.3//hk2-api-3.0.3.jar
 hk2-locator/3.0.3//hk2-locator-3.0.3.jar
@@ -125,7 +125,6 @@ java-diff-utils/4.12//java-diff-utils-4.12.jar
 javassist/3.29.2-GA//javassist-3.29.2-GA.jar
 javax.annotation-api/1.3.2//javax.annotation-api-1.3.2.jar
 javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
-javax.servlet-api/4.0.1//javax.servlet-api-4.0.1.jar
 javolution/5.5.1//javolution-5.5.1.jar
 jaxb-api/2.2.11//jaxb-api-2.2.11.jar
 jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar

diff --git a/pom.xml b/pom.xml
@@ -132,8 +132,8 @@
     <hive.group>org.apache.hive</hive.group>
     <hive.classifier>core</hive.classifier>
     <!-- Version used in Maven Hive dependency -->
-    <hive.version>2.3.101</hive.version>
-    <hive23.version>2.3.101</hive23.version>
+    <hive.version>2.3.102</hive.version>
+    <hive23.version>2.3.102</hive23.version>
     <!-- Version used for internal directory structure -->
     <hive.version.short>2.3</hive.version.short>
     <!-- note that this should be compatible with Kafka brokers version 0.10 and up -->
@@ -145,8 +145,6 @@
     <orc.classifier>shaded-protobuf</orc.classifier>
     <jetty.version>11.0.19</jetty.version>
     <jakartaservlet.version>5.0.0</jakartaservlet.version>
-    <!-- SPARK-46938: Required by Hive / LibThrift libs -->
-    <javaxservlet.version>4.0.1</javaxservlet.version>
     <chill.version>0.10.0</chill.version>
     <ivy.version>2.5.2</ivy.version>
     <oro.version>2.0.8</oro.version>
@@ -350,7 +348,7 @@
 
     <repository>
       <id>github-deploy</id>
-      <url>https://raw.github.com/pan3793/mvn-repo/release-2.3.101/</url>
+      <url>https://raw.github.com/pan3793/mvn-repo/release-2.3.102/</url>
       <snapshots>
         <enabled>true</enabled>
         <updatePolicy>always</updatePolicy>
@@ -2874,11 +2872,6 @@
         <artifactId>jakarta.servlet-api</artifactId>
         <version>${jakartaservlet.version}</version>
       </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>${javaxservlet.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
@@ -270,7 +270,7 @@ object SparkBuild extends PomBuild {
       Resolver.mavenLocal,
       Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ) ++ Seq(
-      "github-deploy" at "https://raw.github.com/pan3793/mvn-repo/release-2.3.101/",
+      "github-deploy" at "https://raw.github.com/pan3793/mvn-repo/release-2.3.102/",
       Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),
     externalResolvers := resolvers.value,

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -3971,7 +3971,7 @@ object SQLConf {
       .createWithDefault(
         sys.env.getOrElse("DEFAULT_ARTIFACT_REPOSITORY",
           // scalastyle:off line.size.limit
-          "https://raw.github.com/pan3793/mvn-repo/release-2.3.101/," +
+          "https://raw.github.com/pan3793/mvn-repo/release-2.3.102/," +
           // scalastyle:on line.size.limit
           "https://maven-central.storage-download.googleapis.com/maven2/"))
 

diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml
@@ -95,11 +95,6 @@
       <artifactId>jetty-servlet</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <!-- Added for selenium: -->
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>

diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
@@ -131,10 +131,6 @@
       <artifactId>httpclient</artifactId>
     </dependency>
     <!-- transitive dependencies of hive-exec-core doesn't declare -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>

diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/package.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/package.scala
@@ -60,7 +60,7 @@ package object client {
 
     // Since HIVE-23980, calcite-core included in Hive package jar.
     // For spark, only VersionsSuite currently creates a hive materialized view for testing.
-    case object v2_3 extends HiveVersion("2.3.101",
+    case object v2_3 extends HiveVersion("2.3.102",
       exclusions = Seq("org.apache.calcite:calcite-core",
         "org.apache.calcite:calcite-druid",
         "org.apache.calcite.avatica:avatica",

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
@@ -387,7 +387,7 @@ object SetMetastoreURLTest extends Logging {
     val builder = SparkSession.builder()
       .config(sparkConf)
       .config(UI_ENABLED.key, "false")
-      .config(HiveUtils.HIVE_METASTORE_VERSION.key, "2.3.101")
+      .config(HiveUtils.HIVE_METASTORE_VERSION.key, "2.3.102")
       // The issue described in SPARK-16901 only appear when
       // spark.sql.hive.metastore.jars is not set to builtin.
       .config(HiveUtils.HIVE_METASTORE_JARS.key, "maven")
@@ -698,7 +698,7 @@ object SparkSQLConfTest extends Logging {
         val filteredSettings = super.getAll.filterNot(e => isMetastoreSetting(e._1))
 
         // Always add these two metastore settings at the beginning.
-        (HiveUtils.HIVE_METASTORE_VERSION.key -> "2.3.101") +:
+        (HiveUtils.HIVE_METASTORE_VERSION.key -> "2.3.102") +:
         (HiveUtils.HIVE_METASTORE_JARS.key -> "maven") +:
         filteredSettings
       }
@@ -726,7 +726,7 @@ object SPARK_9757 extends QueryTest {
     val hiveWarehouseLocation = Utils.createTempDir()
     val sparkContext = new SparkContext(
       new SparkConf()
-        .set(HiveUtils.HIVE_METASTORE_VERSION.key, "2.3.101")
+        .set(HiveUtils.HIVE_METASTORE_VERSION.key, "2.3.102")
         .set(HiveUtils.HIVE_METASTORE_JARS.key, "maven")
         .set(UI_ENABLED, false)
         .set(WAREHOUSE_PATH.key, hiveWarehouseLocation.toString))