Skip to content

Commit db041fd

Browse files
ramitg254ramitg254
authored
HIVE-28856: Remove jetty-runner dependency (Ramit Gupta, reviewed by Denys Kuzmenko, Soumyakanti Das)
Closes apache#5720
1 parent e283416 commit db041fd

6 files changed

Lines changed: 41 additions & 46 deletions

File tree

‎hbase-handler/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</dependency>
225225
<dependency>
226226
<groupId>org.eclipse.jetty</groupId>
227-
<artifactId>jetty-runner</artifactId>
227+
<artifactId>apache-jsp</artifactId>
228228
<scope>test</scope>
229229
</dependency>
230230
<dependency>

‎itests/qtest-druid/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<druid.avatica.version>1.15.0</druid.avatica.version>
3434
<druid.curator.version>4.0.0</druid.curator.version>
3535
<druid.jersey.version>1.19.3</druid.jersey.version>
36-
<druid.jetty.version>9.4.45.v20220203</druid.jetty.version>
36+
<druid.jetty.version>9.4.57.v20241219</druid.jetty.version>
3737
<druid.derby.version>10.11.1.1</druid.derby.version>
3838
<druid.guava.version>16.0.1</druid.guava.version>
3939
<druid.guice.version>4.1.0</druid.guice.version>

‎packaging/src/license/licenses.xml‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<dependency>
303303
<groupId>org.eclipse.jetty.websocket</groupId>
304304
<artifactId>websocket-api</artifactId>
305-
<version>9.4.40.v20210413</version>
305+
<version>9.4.57.v20241219</version>
306306
<licenses>
307307
<license>
308308
<name>Apache Software License - Version 2.0</name>
@@ -314,7 +314,7 @@
314314
<dependency>
315315
<groupId>org.eclipse.jetty.websocket</groupId>
316316
<artifactId>websocket-client</artifactId>
317-
<version>9.4.40.v20210413</version>
317+
<version>9.4.57.v20241219</version>
318318
<licenses>
319319
<license>
320320
<name>Apache Software License - Version 2.0</name>
@@ -326,7 +326,7 @@
326326
<dependency>
327327
<groupId>org.eclipse.jetty.websocket</groupId>
328328
<artifactId>websocket-common</artifactId>
329-
<version>9.4.40.v20210413</version>
329+
<version>9.4.57.v20241219</version>
330330
<licenses>
331331
<license>
332332
<name>Apache Software License - Version 2.0</name>
@@ -338,7 +338,7 @@
338338
<dependency>
339339
<groupId>org.eclipse.jetty.websocket</groupId>
340340
<artifactId>websocket-server</artifactId>
341-
<version>9.4.40.v20210413</version>
341+
<version>9.4.57.v20241219</version>
342342
<licenses>
343343
<license>
344344
<name>Apache Software License - Version 2.0</name>
@@ -350,7 +350,7 @@
350350
<dependency>
351351
<groupId>org.eclipse.jetty.websocket</groupId>
352352
<artifactId>websocket-servlet</artifactId>
353-
<version>9.4.40.v20210413</version>
353+
<version>9.4.57.v20241219</version>
354354
<licenses>
355355
<license>
356356
<name>Apache Software License - Version 2.0</name>
@@ -362,7 +362,7 @@
362362
<dependency>
363363
<groupId>org.eclipse.jetty</groupId>
364364
<artifactId>apache-jsp</artifactId>
365-
<version>9.4.40.v20210413</version>
365+
<version>9.4.57.v20241219</version>
366366
<licenses>
367367
<license>
368368
<name>Apache Software License - Version 2.0</name>
@@ -371,10 +371,23 @@
371371
</license>
372372
</licenses>
373373
</dependency>
374+
<dependency>
375+
<groupId>org.eclipse.jdt</groupId>
376+
<artifactId>ecj</artifactId>
377+
<version>3.26.0</version>
378+
<licenses>
379+
<license>
380+
<name>Eclipse Public License v. 2.0</name>
381+
<url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</url>
382+
<distribution>repo</distribution>
383+
<file>eclipse-public-license-v.-2.0-epl-2.0.txt</file>
384+
</license>
385+
</licenses>
386+
</dependency>
374387
<dependency>
375388
<groupId>org.eclipse.jetty</groupId>
376389
<artifactId>apache-jstl</artifactId>
377-
<version>9.4.40.v20210413</version>
390+
<version>9.4.57.v20241219</version>
378391
<licenses>
379392
<license>
380393
<name>Apache Software License - Version 2.0</name>
@@ -386,7 +399,7 @@
386399
<dependency>
387400
<groupId>org.eclipse.jetty</groupId>
388401
<artifactId>jetty-annotations</artifactId>
389-
<version>9.4.40.v20210413</version>
402+
<version>9.4.57.v20241219</version>
390403
<licenses>
391404
<license>
392405
<name>Apache Software License - Version 2.0</name>
@@ -398,7 +411,7 @@
398411
<dependency>
399412
<groupId>org.eclipse.jetty</groupId>
400413
<artifactId>jetty-client</artifactId>
401-
<version>9.4.40.v20210413</version>
414+
<version>9.4.57.v20241219</version>
402415
<licenses>
403416
<license>
404417
<name>Apache Software License - Version 2.0</name>
@@ -410,7 +423,7 @@
410423
<dependency>
411424
<groupId>org.eclipse.jetty</groupId>
412425
<artifactId>jetty-http</artifactId>
413-
<version>9.4.40.v20210413</version>
426+
<version>9.4.57.v20241219</version>
414427
<licenses>
415428
<license>
416429
<name>Apache Software License - Version 2.0</name>
@@ -422,7 +435,7 @@
422435
<dependency>
423436
<groupId>org.eclipse.jetty</groupId>
424437
<artifactId>jetty-io</artifactId>
425-
<version>9.4.40.v20210413</version>
438+
<version>9.4.57.v20241219</version>
426439
<licenses>
427440
<license>
428441
<name>Apache Software License - Version 2.0</name>
@@ -434,7 +447,7 @@
434447
<dependency>
435448
<groupId>org.eclipse.jetty</groupId>
436449
<artifactId>jetty-jaas</artifactId>
437-
<version>9.4.40.v20210413</version>
450+
<version>9.4.57.v20241219</version>
438451
<licenses>
439452
<license>
440453
<name>Apache Software License - Version 2.0</name>
@@ -446,7 +459,7 @@
446459
<dependency>
447460
<groupId>org.eclipse.jetty</groupId>
448461
<artifactId>jetty-jndi</artifactId>
449-
<version>9.4.40.v20210413</version>
462+
<version>9.4.57.v20241219</version>
450463
<licenses>
451464
<license>
452465
<name>Apache Software License - Version 2.0</name>
@@ -458,7 +471,7 @@
458471
<dependency>
459472
<groupId>org.eclipse.jetty</groupId>
460473
<artifactId>jetty-plus</artifactId>
461-
<version>9.4.40.v20210413</version>
474+
<version>9.4.57.v20241219</version>
462475
<licenses>
463476
<license>
464477
<name>Apache Software License - Version 2.0</name>
@@ -470,19 +483,7 @@
470483
<dependency>
471484
<groupId>org.eclipse.jetty</groupId>
472485
<artifactId>jetty-rewrite</artifactId>
473-
<version>9.4.40.v20210413</version>
474-
<licenses>
475-
<license>
476-
<name>Apache Software License - Version 2.0</name>
477-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
478-
<file>APACHE-2.0</file>
479-
</license>
480-
</licenses>
481-
</dependency>
482-
<dependency>
483-
<groupId>org.eclipse.jetty</groupId>
484-
<artifactId>jetty-runner</artifactId>
485-
<version>9.4.40.v20210413</version>
486+
<version>9.4.57.v20241219</version>
486487
<licenses>
487488
<license>
488489
<name>Apache Software License - Version 2.0</name>
@@ -494,7 +495,7 @@
494495
<dependency>
495496
<groupId>org.eclipse.jetty</groupId>
496497
<artifactId>jetty-security</artifactId>
497-
<version>9.4.40.v20210413</version>
498+
<version>9.4.57.v20241219</version>
498499
<licenses>
499500
<license>
500501
<name>Apache Software License - Version 2.0</name>
@@ -506,7 +507,7 @@
506507
<dependency>
507508
<groupId>org.eclipse.jetty</groupId>
508509
<artifactId>jetty-server</artifactId>
509-
<version>9.4.40.v20210413</version>
510+
<version>9.4.57.v20241219</version>
510511
<licenses>
511512
<license>
512513
<name>Apache Software License - Version 2.0</name>
@@ -518,7 +519,7 @@
518519
<dependency>
519520
<groupId>org.eclipse.jetty</groupId>
520521
<artifactId>jetty-servlet</artifactId>
521-
<version>9.4.40.v20210413</version>
522+
<version>9.4.57.v20241219</version>
522523
<licenses>
523524
<license>
524525
<name>Apache Software License - Version 2.0</name>
@@ -530,7 +531,7 @@
530531
<dependency>
531532
<groupId>org.eclipse.jetty</groupId>
532533
<artifactId>jetty-util-ajax</artifactId>
533-
<version>9.4.40.v20210413</version>
534+
<version>9.4.57.v20241219</version>
534535
<licenses>
535536
<license>
536537
<name>Apache Software License - Version 2.0</name>
@@ -542,7 +543,7 @@
542543
<dependency>
543544
<groupId>org.eclipse.jetty</groupId>
544545
<artifactId>jetty-util</artifactId>
545-
<version>9.4.40.v20210413</version>
546+
<version>9.4.57.v20241219</version>
546547
<licenses>
547548
<license>
548549
<name>Apache Software License - Version 2.0</name>
@@ -554,7 +555,7 @@
554555
<dependency>
555556
<groupId>org.eclipse.jetty</groupId>
556557
<artifactId>jetty-webapp</artifactId>
557-
<version>9.4.40.v20210413</version>
558+
<version>9.4.57.v20241219</version>
558559
<licenses>
559560
<license>
560561
<name>Apache Software License - Version 2.0</name>
@@ -566,7 +567,7 @@
566567
<dependency>
567568
<groupId>org.eclipse.jetty</groupId>
568569
<artifactId>jetty-xml</artifactId>
569-
<version>9.4.40.v20210413</version>
570+
<version>9.4.57.v20241219</version>
570571
<licenses>
571572
<license>
572573
<name>Apache Software License - Version 2.0</name>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<javax-servlet.version>3.1.0</javax-servlet.version>
159159
<javolution.version>5.5.1</javolution.version>
160160
<jettison.version>1.5.4</jettison.version>
161-
<jetty.version>9.4.45.v20220203</jetty.version>
161+
<jetty.version>9.4.57.v20241219</jetty.version>
162162
<jersey.version>1.19.4</jersey.version>
163163
<jline.version>2.14.6</jline.version>
164164
<jms.version>2.0.2</jms.version>
@@ -784,7 +784,7 @@
784784
</dependency>
785785
<dependency>
786786
<groupId>org.eclipse.jetty</groupId>
787-
<artifactId>jetty-runner</artifactId>
787+
<artifactId>apache-jsp</artifactId>
788788
<version>${jetty.version}</version>
789789
</dependency>
790790
<dependency>

‎service/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,7 @@
111111
</dependency>
112112
<dependency>
113113
<groupId>org.eclipse.jetty</groupId>
114-
<artifactId>jetty-runner</artifactId>
115-
<exclusions>
116-
<exclusion>
117-
<groupId>org.mortbay.jasper</groupId>
118-
<artifactId>apache-jsp</artifactId>
119-
</exclusion>
120-
</exclusions>
114+
<artifactId>apache-jsp</artifactId>
121115
</dependency>
122116
<dependency>
123117
<groupId>javax.servlet</groupId>

‎standalone-metastore/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<httpcomponents.client.version>4.5.13</httpcomponents.client.version>
112112
<pac4j-core.version>4.5.8</pac4j-core.version>
113113
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
114-
<jetty.version>9.4.45.v20220203</jetty.version>
114+
<jetty.version>9.4.57.v20241219</jetty.version>
115115
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
116116
<!-- If upgrading, upgrade atlas as well in ql/pom.xml, which brings in some springframework dependencies transitively -->
117117
<spring.version>5.3.39</spring.version>

0 commit comments

Comments
 (0)