diff --git a/LICENSE-binary b/LICENSE-binary index a21f594cbe4ea..541cc4c544f34 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -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* @@ -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 diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 5eb61f7ae7dd9..b8817ca971b26 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -1,4 +1,3 @@ -FastInfoset-1.2.16.jar JavaEWAH-0.3.2.jar RoaringBitmap-0.5.11.jar ST4-4.0.4.jar @@ -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 diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index 893d0a06c2a06..9ea0633556500 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -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 @@ -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 diff --git a/licenses-binary/LICENSE-stax-ex.txt b/licenses-binary/LICENSE-stax-ex.txt deleted file mode 100644 index 02319e94f5f12..0000000000000 --- a/licenses-binary/LICENSE-stax-ex.txt +++ /dev/null @@ -1,11 +0,0 @@ -Eclipse Distribution License - v 1.0 -Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/licenses-binary/LICENSE-txw2.txt b/licenses-binary/LICENSE-txw2.txt deleted file mode 100644 index 02319e94f5f12..0000000000000 --- a/licenses-binary/LICENSE-txw2.txt +++ /dev/null @@ -1,11 +0,0 @@ -Eclipse Distribution License - v 1.0 -Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/pom.xml b/pom.xml index dca87f4f1b248..b7fec2d95ac14 100644 --- a/pom.xml +++ b/pom.xml @@ -415,6 +415,21 @@ jaxb-runtime 2.3.2 runtime + + + + com.sun.xml.fastinfoset + FastInfoset + + + org.glassfish.jaxb + txw2 + + + org.jvnet.staxex + stax-ex + + org.apache.commons