Skip to content

Commit

Permalink
[SPARK-35210][BUILD][2.4] Upgrade Jetty to 9.4.40 to fix ERR_CONNECTI…
Browse files Browse the repository at this point in the history
…ON_RESET issue

### What changes were proposed in this pull request?

This PR backports SPARK-35210 (#32318).
This PR proposes to upgrade Jetty to 9.4.40.

### Why are the changes needed?

SPARK-34988 (#32091) upgraded Jetty to 9.4.39 for CVE-2021-28165.
But after the upgrade, Jetty 9.4.40 was released to fix the ERR_CONNECTION_RESET issue (jetty/jetty.project#6152).
This issue seems to affect Jetty 9.4.39 when POST method is used with SSL.
For Spark, job submission using REST and ThriftServer with HTTPS protocol can be affected.

### Does this PR introduce _any_ user-facing change?

No. No released version uses Jetty 9.3.39.

### How was this patch tested?

CI.

Closes #32322 from sarutak/backport-SPARK-35210.

Authored-by: Kousuke Saruta <sarutak@oss.nttdata.com>
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
  • Loading branch information
sarutak authored and viirya committed Apr 25, 2021
1 parent bec7389 commit 67aad59
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions dev/deps/spark-deps-hadoop-3.1
Expand Up @@ -116,8 +116,8 @@ jersey-container-servlet/2.22.2//jersey-container-servlet-2.22.2.jar
jersey-guava/2.22.2//jersey-guava-2.22.2.jar
jersey-media-jaxb/2.22.2//jersey-media-jaxb-2.22.2.jar
jersey-server/2.22.2//jersey-server-2.22.2.jar
jetty-webapp/9.4.39.v20210325//jetty-webapp-9.4.39.v20210325.jar
jetty-xml/9.4.39.v20210325//jetty-xml-9.4.39.v20210325.jar
jetty-webapp/9.4.40.v20210413//jetty-webapp-9.4.40.v20210413.jar
jetty-xml/9.4.40.v20210413//jetty-xml-9.4.40.v20210413.jar
jline/2.14.6//jline-2.14.6.jar
joda-time/2.9.3//joda-time-2.9.3.jar
jodd-core/3.5.2//jodd-core-3.5.2.jar
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -134,7 +134,7 @@
<orc.version>1.5.5</orc.version>
<orc.classifier>nohive</orc.classifier>
<hive.parquet.version>1.6.0</hive.parquet.version>
<jetty.version>9.4.39.v20210325</jetty.version>
<jetty.version>9.4.40.v20210413</jetty.version>
<javaxservlet.version>3.1.0</javaxservlet.version>
<chill.version>0.9.3</chill.version>
<ivy.version>2.4.0</ivy.version>
Expand Down

0 comments on commit 67aad59

Please sign in to comment.