Repository: spark Updated Branches: refs/heads/master ea63a7a16 -> b3e6fe7c4
[SPARK-23654][BUILD] remove jets3t as a dependency of spark ## What changes were proposed in this pull request? Remove jets3t dependency, and bouncy castle which it brings in; update licenses and deps Note this just takes over https://github.com/apache/spark/pull/21146 ## How was this patch tested? Existing tests. Closes #22081 from srowen/SPARK-23654. Authored-by: Sean Owen <sro...@gmail.com> Signed-off-by: Sean Owen <sean.o...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b3e6fe7c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b3e6fe7c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b3e6fe7c Branch: refs/heads/master Commit: b3e6fe7c46bad991e850d258887400db5f7d7736 Parents: ea63a7a Author: Sean Owen <sro...@gmail.com> Authored: Thu Aug 16 12:34:23 2018 -0700 Committer: Sean Owen <sean.o...@databricks.com> Committed: Thu Aug 16 12:34:23 2018 -0700 ---------------------------------------------------------------------- LICENSE-binary | 2 -- NOTICE | 2 -- NOTICE-binary | 21 --------------- core/pom.xml | 4 +-- dev/deps/spark-deps-hadoop-2.6 | 4 --- dev/deps/spark-deps-hadoop-2.7 | 4 --- dev/deps/spark-deps-hadoop-3.1 | 4 --- external/kafka-0-10-assembly/pom.xml | 5 ---- external/kafka-0-8-assembly/pom.xml | 5 ---- external/kinesis-asl-assembly/pom.xml | 5 ---- licenses-binary/LICENSE-bouncycastle-bcprov.txt | 7 ----- pom.xml | 28 ++++++++------------ 12 files changed, 13 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/LICENSE-binary ---------------------------------------------------------------------- diff --git a/LICENSE-binary b/LICENSE-binary index c033dd8..b94ea90 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -228,7 +228,6 @@ org.apache.xbean:xbean-asm5-shaded com.squareup.okhttp3:logging-interceptor com.squareup.okhttp3:okhttp com.squareup.okio:okio -net.java.dev.jets3t:jets3t org.apache.spark:spark-catalyst_2.11 org.apache.spark:spark-kvstore_2.11 org.apache.spark:spark-launcher_2.11 @@ -447,7 +446,6 @@ org.slf4j:jul-to-slf4j org.slf4j:slf4j-api org.slf4j:slf4j-log4j12 com.github.scopt:scopt_2.11 -org.bouncycastle:bcprov-jdk15on core/src/main/resources/org/apache/spark/ui/static/dagre-d3.min.js core/src/main/resources/org/apache/spark/ui/static/*dataTables* http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 23cb53f..fefe08b 100644 --- a/NOTICE +++ b/NOTICE @@ -26,5 +26,3 @@ The following provides more details on the included cryptographic software: This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to support authentication, and encryption and decryption of data sent across the network between services. - -This software includes Bouncy Castle (http://bouncycastle.org/) to support the jets3t library. http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/NOTICE-binary ---------------------------------------------------------------------- diff --git a/NOTICE-binary b/NOTICE-binary index ad256aa..b707c43 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -27,8 +27,6 @@ This software uses Apache Commons Crypto (https://commons.apache.org/proper/comm support authentication, and encryption and decryption of data sent across the network between services. -This software includes Bouncy Castle (http://bouncycastle.org/) to support the jets3t library. - // ------------------------------------------------------------------ // NOTICE file corresponding to the section 4d of The Apache License, @@ -1162,25 +1160,6 @@ NonlinearMinimizer class in package breeze.optimize.proximal is distributed with 2015, Debasish Das (Verizon), all rights reserved. - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the distribution of jets3t. == - ========================================================================= - - This product includes software developed by: - - The Apache Software Foundation (http://www.apache.org/). - - The ExoLab Project (http://www.exolab.org/) - - Sun Microsystems (http://www.sun.com/) - - Codehaus (http://castor.codehaus.org) - - Tatu Saloranta (http://wiki.fasterxml.com/TatuSaloranta) - - - stream-lib Copyright 2016 AddThis http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index d0b869e..5fa3a86 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -88,8 +88,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> </dependency> <dependency> <groupId>org.apache.curator</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/dev/deps/spark-deps-hadoop-2.6 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index bdab79c..30727e6 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -21,8 +21,6 @@ automaton-1.11-8.jar avro-1.8.2.jar avro-ipc-1.8.2.jar avro-mapred-1.8.2-hadoop2.jar -base64-2.3.8.jar -bcprov-jdk15on-1.58.jar bonecp-0.8.0.RELEASE.jar breeze-macros_2.11-0.13.2.jar breeze_2.11-0.13.2.jar @@ -101,7 +99,6 @@ jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar janino-3.0.8.jar -java-xmlbuilder-1.1.jar javassist-3.18.1-GA.jar javax.annotation-api-1.2.jar javax.inject-1.jar @@ -119,7 +116,6 @@ 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 -jets3t-0.9.4.jar jetty-6.1.26.jar jetty-util-6.1.26.jar jline-2.14.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/dev/deps/spark-deps-hadoop-2.7 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index ddaf9bb..e58ae7a 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -21,8 +21,6 @@ automaton-1.11-8.jar avro-1.8.2.jar avro-ipc-1.8.2.jar avro-mapred-1.8.2-hadoop2.jar -base64-2.3.8.jar -bcprov-jdk15on-1.58.jar bonecp-0.8.0.RELEASE.jar breeze-macros_2.11-0.13.2.jar breeze_2.11-0.13.2.jar @@ -101,7 +99,6 @@ jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11-2.6.7.1.jar jackson-xc-1.9.13.jar janino-3.0.8.jar -java-xmlbuilder-1.1.jar javassist-3.18.1-GA.jar javax.annotation-api-1.2.jar javax.inject-1.jar @@ -119,7 +116,6 @@ 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 -jets3t-0.9.4.jar jetty-6.1.26.jar jetty-sslengine-6.1.26.jar jetty-util-6.1.26.jar http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/dev/deps/spark-deps-hadoop-3.1 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index d25d7aa..8a65860 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -19,8 +19,6 @@ automaton-1.11-8.jar avro-1.8.2.jar avro-ipc-1.8.2.jar avro-mapred-1.8.2-hadoop2.jar -base64-2.3.8.jar -bcprov-jdk15on-1.58.jar bonecp-0.8.0.RELEASE.jar breeze-macros_2.11-0.13.2.jar breeze_2.11-0.13.2.jar @@ -100,7 +98,6 @@ jackson-module-jaxb-annotations-2.6.7.jar jackson-module-paranamer-2.7.9.jar jackson-module-scala_2.11-2.6.7.1.jar janino-3.0.8.jar -java-xmlbuilder-1.1.jar javassist-3.18.1-GA.jar javax.annotation-api-1.2.jar javax.inject-1.jar @@ -119,7 +116,6 @@ 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 -jets3t-0.9.4.jar jetty-webapp-9.3.24.v20180605.jar jetty-xml-9.3.24.v20180605.jar jline-2.14.3.jar http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/external/kafka-0-10-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index a742b8d..f80f8e3 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -96,11 +96,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/external/kafka-0-8-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 41bc8b3..6be17a8 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -96,11 +96,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/external/kinesis-asl-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 37c7d1e..68fded5 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -90,11 +90,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/licenses-binary/LICENSE-bouncycastle-bcprov.txt ---------------------------------------------------------------------- diff --git a/licenses-binary/LICENSE-bouncycastle-bcprov.txt b/licenses-binary/LICENSE-bouncycastle-bcprov.txt deleted file mode 100644 index c445a93..0000000 --- a/licenses-binary/LICENSE-bouncycastle-bcprov.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/spark/blob/b3e6fe7c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 33c15f2..ab2a272 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,6 @@ <codahale.metrics.version>3.1.5</codahale.metrics.version> <avro.version>1.8.2</avro.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> - <jets3t.version>0.9.4</jets3t.version> <aws.kinesis.client.version>1.8.10</aws.kinesis.client.version> <!-- Should be consistent with Kinesis client dependency --> <aws.java.sdk.version>1.11.271</aws.java.sdk.version> @@ -911,6 +910,10 @@ <groupId>com.sun.jersey.contribs</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -984,24 +987,15 @@ </exclusion> </exclusions> </dependency> - <!-- See SPARK-1556 for info on this dependency: --> + <!-- See SPARK-23654 for info on this dependency; + It is used to keep javax.activation at v1.1.1 after dropping + jets3t as a dependency. + --> <dependency> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - <version>${jets3t.version}</version> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> <scope>${hadoop.deps.scope}</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <!-- brought in by jets3t; see SPARK-22634 --> - <version>1.58</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
