Skip to content

Commit f7c9de9

Browse files
committed
[SPARK-28765][BUILD] Add explict exclusions to avoid JDK11 dependency issue
### What changes were proposed in this pull request? This PR adds explicit exclusions to avoid Maven `JDK11` dependency issues. ### Why are the changes needed? Maven/Ivy seems to be confused during dependency generation on `JDK11` environment. This is not only wrong, but also causes a Jenkins failure during dependency manifest check on `JDK11` environment. **JDK8** ``` $ cd core $ mvn -X dependency:tree -Dincludes=jakarta.activation:jakarta.activation-api ... [DEBUG] org.glassfish.jersey.core:jersey-server:jar:2.29:compile (version managed from 2.22.2) [DEBUG] org.glassfish.jersey.media:jersey-media-jaxb:jar:2.29:compile [DEBUG] javax.validation:validation-api:jar:2.0.1.Final:compile ``` **JDK11** ``` [DEBUG] org.glassfish.jersey.core:jersey-server:jar:2.29:compile (version managed from 2.22.2) [DEBUG] org.glassfish.jersey.media:jersey-media-jaxb:jar:2.29:compile [DEBUG] javax.validation:validation-api:jar:2.0.1.Final:compile [DEBUG] jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2:compile [DEBUG] jakarta.activation:jakarta.activation-api:jar:1.2.1:compile ``` ### Does this PR introduce any user-facing change? No. ### How was this patch tested? Do the following in both `JDK8` and `JDK11` environment. The dependency manifest should not be changed. In the current `master` branch, `JDK11` changes the dependency manifest. ``` $ dev/test-dependencies.sh --replace-manifest ``` Closes #25481 from dongjoon-hyun/SPARK-28765. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 1819a6f commit f7c9de9

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,11 +730,25 @@
730730
<groupId>org.glassfish.jersey.core</groupId>
731731
<artifactId>jersey-server</artifactId>
732732
<version>${jersey.version}</version>
733+
<!-- SPARK-28765 Unused JDK11-specific dependency -->
734+
<exclusions>
735+
<exclusion>
736+
<groupId>jakarta.xml.bind</groupId>
737+
<artifactId>jakarta.xml.bind-api</artifactId>
738+
</exclusion>
739+
</exclusions>
733740
</dependency>
734741
<dependency>
735742
<groupId>org.glassfish.jersey.core</groupId>
736743
<artifactId>jersey-common</artifactId>
737744
<version>${jersey.version}</version>
745+
<!-- SPARK-28765 Unused JDK11-specific dependency -->
746+
<exclusions>
747+
<exclusion>
748+
<groupId>com.sun.activation</groupId>
749+
<artifactId>jakarta.activation</artifactId>
750+
</exclusion>
751+
</exclusions>
738752
</dependency>
739753
<dependency>
740754
<groupId>org.glassfish.jersey.core</groupId>

resource-managers/kubernetes/core/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
<groupId>com.fasterxml.jackson.dataformat</groupId>
6767
<artifactId>jackson-dataformat-yaml</artifactId>
6868
</exclusion>
69+
<!-- SPARK-28765 Unused JDK11-specific dependency -->
70+
<exclusion>
71+
<groupId>javax.annotation</groupId>
72+
<artifactId>javax.annotation-api</artifactId>
73+
</exclusion>
6974
</exclusions>
7075
</dependency>
7176

0 commit comments

Comments
 (0)