Skip to content

Commit

Permalink
[SPARK-26986][ML][FOLLOWUP] Add JAXB reference impl to build for Java 9+
Browse files Browse the repository at this point in the history
## What changes were proposed in this pull request?

Remove a few new JAXB dependencies that shouldn't be necessary now.
See #23890 (comment)

## How was this patch tested?

Existing tests

Closes #23923 from srowen/SPARK-26986.2.

Authored-by: Sean Owen <sean.owen@databricks.com>
Signed-off-by: Sean Owen <sean.owen@databricks.com>
  • Loading branch information
srowen committed Mar 1, 2019
1 parent bc7592b commit 131b464
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 31 deletions.
3 changes: 0 additions & 3 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ org.eclipse.jetty:jetty-servlets
org.eclipse.jetty:jetty-util
org.eclipse.jetty:jetty-webapp
org.eclipse.jetty:jetty-xml
com.sun.xml.fastinfoset:FastInfoset

core/src/main/java/org/apache/spark/util/collection/TimSort.java
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
Expand Down Expand Up @@ -493,9 +492,7 @@ Eclipse Distribution License (EDL) 1.0

org.glassfish.jaxb:jaxb-runtime
jakarta.xml.bind:jakarta.xml.bind-api
org.glassfish.jaxb:txw2
com.sun.istack:istack-commons-runtime
org.jvnet.staxex:stax-ex
jakarta.activation:jakarta.activation-api


Expand Down
3 changes: 0 additions & 3 deletions dev/deps/spark-deps-hadoop-2.7
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FastInfoset-1.2.16.jar
JavaEWAH-0.3.2.jar
RoaringBitmap-0.5.11.jar
ST4-4.0.4.jar
Expand Down Expand Up @@ -191,11 +190,9 @@ spire-macros_2.12-0.13.0.jar
spire_2.12-0.13.0.jar
stax-api-1.0-2.jar
stax-api-1.0.1.jar
stax-ex-1.8.1.jar
stream-2.7.0.jar
stringtemplate-3.2.1.jar
super-csv-2.2.0.jar
txw2-2.3.2.jar
univocity-parsers-2.7.3.jar
validation-api-1.1.0.Final.jar
xbean-asm7-shaded-4.12.jar
Expand Down
3 changes: 0 additions & 3 deletions dev/deps/spark-deps-hadoop-3.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FastInfoset-1.2.16.jar
HikariCP-java7-2.4.12.jar
JavaEWAH-0.3.2.jar
RoaringBitmap-0.5.11.jar
Expand Down Expand Up @@ -208,13 +207,11 @@ snappy-java-1.1.7.1.jar
spire-macros_2.12-0.13.0.jar
spire_2.12-0.13.0.jar
stax-api-1.0.1.jar
stax-ex-1.8.1.jar
stax2-api-3.1.4.jar
stream-2.7.0.jar
stringtemplate-3.2.1.jar
super-csv-2.2.0.jar
token-provider-1.0.1.jar
txw2-2.3.2.jar
univocity-parsers-2.7.3.jar
validation-api-1.1.0.Final.jar
woodstox-core-5.0.3.jar
Expand Down
11 changes: 0 additions & 11 deletions licenses-binary/LICENSE-stax-ex.txt

This file was deleted.

11 changes: 0 additions & 11 deletions licenses-binary/LICENSE-txw2.txt

This file was deleted.

15 changes: 15 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,21 @@
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
<exclusions>
<!-- for now, we only write XML in PMML export, and these can be excluded -->
<exclusion>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
</exclusion>
<exclusion>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down

0 comments on commit 131b464

Please sign in to comment.