This is an automated email from the ASF dual-hosted git repository.
dkuzmenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new db041fd7b71 HIVE-28856: Remove jetty-runner dependency (Ramit Gupta,
reviewed by Denys Kuzmenko, Soumyakanti Das)
db041fd7b71 is described below
commit db041fd7b71a15a8bd1a997b0908a02e8124d7ac
Author: ramitg254 <[email protected]>
AuthorDate: Fri Apr 11 14:01:03 2025 +0530
HIVE-28856: Remove jetty-runner dependency (Ramit Gupta, reviewed by Denys
Kuzmenko, Soumyakanti Das)
Closes #5720
---
hbase-handler/pom.xml | 2 +-
itests/qtest-druid/pom.xml | 2 +-
packaging/src/license/licenses.xml | 69 +++++++++++++++++++-------------------
pom.xml | 4 +--
service/pom.xml | 8 +----
standalone-metastore/pom.xml | 2 +-
6 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index f9609c1a2da..1ae6edd32e3 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -224,7 +224,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-runner</artifactId>
+ <artifactId>apache-jsp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index 3c014d24caa..cdde22618f5 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -33,7 +33,7 @@
<druid.avatica.version>1.15.0</druid.avatica.version>
<druid.curator.version>4.0.0</druid.curator.version>
<druid.jersey.version>1.19.3</druid.jersey.version>
- <druid.jetty.version>9.4.45.v20220203</druid.jetty.version>
+ <druid.jetty.version>9.4.57.v20241219</druid.jetty.version>
<druid.derby.version>10.11.1.1</druid.derby.version>
<druid.guava.version>16.0.1</druid.guava.version>
<druid.guice.version>4.1.0</druid.guice.version>
diff --git a/packaging/src/license/licenses.xml
b/packaging/src/license/licenses.xml
index 70fc2830e7d..f3f631bb50a 100644
--- a/packaging/src/license/licenses.xml
+++ b/packaging/src/license/licenses.xml
@@ -302,7 +302,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-api</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -314,7 +314,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -326,7 +326,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-common</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -338,7 +338,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -350,7 +350,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -362,7 +362,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -371,10 +371,23 @@
</license>
</licenses>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.26.0</version>
+ <licenses>
+ <license>
+ <name>Eclipse Public License v. 2.0</name>
+ <url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</url>
+ <distribution>repo</distribution>
+ <file>eclipse-public-license-v.-2.0-epl-2.0.txt</file>
+ </license>
+ </licenses>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -386,7 +399,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -398,7 +411,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -410,7 +423,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -422,7 +435,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -434,7 +447,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -446,7 +459,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -458,7 +471,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -470,19 +483,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
- <version>9.4.40.v20210413</version>
- <licenses>
- <license>
- <name>Apache Software License - Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <file>APACHE-2.0</file>
- </license>
- </licenses>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-runner</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -494,7 +495,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -506,7 +507,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -518,7 +519,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -530,7 +531,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -542,7 +543,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -554,7 +555,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
@@ -566,7 +567,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
- <version>9.4.40.v20210413</version>
+ <version>9.4.57.v20241219</version>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
diff --git a/pom.xml b/pom.xml
index 2a313aabf51..b443ed56451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<javax-servlet.version>3.1.0</javax-servlet.version>
<javolution.version>5.5.1</javolution.version>
<jettison.version>1.5.4</jettison.version>
- <jetty.version>9.4.45.v20220203</jetty.version>
+ <jetty.version>9.4.57.v20241219</jetty.version>
<jersey.version>1.19.4</jersey.version>
<jline.version>2.14.6</jline.version>
<jms.version>2.0.2</jms.version>
@@ -784,7 +784,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-runner</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
diff --git a/service/pom.xml b/service/pom.xml
index 3c41273a6bb..6cf127ca8e7 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -111,13 +111,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-runner</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.mortbay.jasper</groupId>
- <artifactId>apache-jsp</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index e77cc0f4e4b..c47fc92ca34 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -111,7 +111,7 @@
<httpcomponents.client.version>4.5.13</httpcomponents.client.version>
<pac4j-core.version>4.5.8</pac4j-core.version>
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
- <jetty.version>9.4.45.v20220203</jetty.version>
+ <jetty.version>9.4.57.v20241219</jetty.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<!-- If upgrading, upgrade atlas as well in ql/pom.xml, which brings in
some springframework dependencies transitively -->
<spring.version>5.3.39</spring.version>
