Skip to content

Commit

Permalink
[SPARK-30051][BUILD] Clean up hadoop-3.2 dependency
Browse files Browse the repository at this point in the history
This PR aims to cut `org.eclipse.jetty:jetty-webapp`and `org.eclipse.jetty:jetty-xml` transitive dependency from `hadoop-common`.

This will simplify our dependency management by the removal of unused dependencies.

No.

Pass the GitHub Action with all combinations and the Jenkins UT with (Hadoop-3.2).

Closes apache#26742 from dongjoon-hyun/SPARK-30051.

Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
  • Loading branch information
dongjoon-hyun authored and Will Manning committed Jun 19, 2020
1 parent 37f57e7 commit cc9cdc7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
16 changes: 7 additions & 9 deletions dev/deps/spark-deps-hadoop-3.2
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,13 @@ jaxb-runtime-2.3.2.jar
jcip-annotations-1.0-1.jar
jcl-over-slf4j-1.7.16.jar
jdo-api-3.0.1.jar
jersey-client-2.22.2.jar
jersey-common-2.22.2.jar
jersey-container-servlet-2.22.2.jar
jersey-container-servlet-core-2.22.2.jar
jersey-guava-2.22.2.jar
jersey-media-jaxb-2.22.2.jar
jersey-server-2.22.2.jar
jetty-webapp-9.4.12.v20180830.jar
jetty-xml-9.4.12.v20180830.jar
jersey-client-2.29.jar
jersey-common-2.29.jar
jersey-container-servlet-2.29.jar
jersey-container-servlet-core-2.29.jar
jersey-hk2-2.29.jar
jersey-media-jaxb-2.29.jar
jersey-server-2.29.jar
jline-2.14.6.jar
joda-time-2.9.3.jar
jodd-core-3.5.2.jar
Expand Down
11 changes: 8 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -477,9 +477,10 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -1126,6 +1127,10 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down

0 comments on commit cc9cdc7

Please sign in to comment.