Skip to content

Commit

Permalink
[SPARK-29308][BUILD] Update deps in dev/deps/spark-deps-hadoop-3.2 fo…
Browse files Browse the repository at this point in the history
…r hadoop-3.2

### What changes were proposed in this pull request?

Current dev/deps/spark-deps-hadoop-3.2 have some wrong deps,   it's caused by `dev/test-dependencies.sh ` when build assembly dependencies.
add maven compile parameter `-am` to make it build with all deps, and get right result.

And update NOTICE-binary & NOTICE-binary for updated result.

### Why are the changes needed?
Update dev/deps/spark-hadoop-3.2

### Does this PR introduce any user-facing change?
No

### How was this patch tested?
N/A

Closes #25984 from AngersZhuuuu/SPARK=29308.

Authored-by: angerszhu <angers.zhu@gmail.com>
Signed-off-by: Sean Owen <sean.owen@databricks.com>
  • Loading branch information
AngersZhuuuu authored and srowen committed Oct 13, 2019
1 parent 148cd26 commit ef81525
Show file tree
Hide file tree
Showing 6 changed files with 947 additions and 19 deletions.
20 changes: 14 additions & 6 deletions LICENSE-binary
Expand Up @@ -225,7 +225,7 @@ org.scalanlp:breeze-macros_2.12
org.scalanlp:breeze_2.12
org.typelevel:macro-compat_2.12
org.yaml:snakeyaml
org.apache.xbean:xbean-asm5-shaded
org.apache.xbean:xbean-asm7-shaded
com.squareup.okhttp3:logging-interceptor
com.squareup.okhttp3:okhttp
com.squareup.okio:okio
Expand Down Expand Up @@ -254,6 +254,7 @@ commons-codec:commons-codec
commons-collections:commons-collections
io.fabric8:kubernetes-client
io.fabric8:kubernetes-model
io.fabric8:kubernetes-model-common
io.netty:netty-all
net.hydromatic:eigenbase-properties
net.sf.supercsv:super-csv
Expand Down Expand Up @@ -320,11 +321,14 @@ com.github.mifmif:generex
com.github.stephenc.jcip:jcip-annotations
com.google.code.findbugs:jsr305
com.google.code.gson:gson
com.google.flatbuffers:flatbuffers-java
com.google.guava:guava
com.google.inject:guice
com.google.inject.extensions:guice-servlet
com.nimbusds:nimbus-jose-jwt
com.twitter:parquet-hadoop-bundle
commons-cli:commons-cli
commons-daemon:commons-daemon
commons-dbcp:commons-dbcp
commons-io:commons-io
commons-lang:commons-lang
Expand Down Expand Up @@ -369,11 +373,6 @@ org.datanucleus:datanucleus-api-jdo
org.datanucleus:datanucleus-core
org.datanucleus:datanucleus-rdbms
org.lz4:lz4-java
org.spark-project.hive:hive-beeline
org.spark-project.hive:hive-cli
org.spark-project.hive:hive-exec
org.spark-project.hive:hive-jdbc
org.spark-project.hive:hive-metastore
org.xerial.snappy:snappy-java
stax:stax-api
xerces:xercesImpl
Expand All @@ -397,18 +396,25 @@ org.scala-lang.modules:scala-xml_2.12
org.opencypher:okapi-shade
com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter
com.zaxxer.HikariCP
org.apache.hive:hive-beeline
org.apache.hive:hive-cli
org.apache.hive:hive-common
org.apache.hive:hive-exec
org.apache.hive:hive-jdbc
org.apache.hive:hive-llap-common
org.apache.hive:hive-metastore
org.apache.hive:hive-serde
org.apache.hive:hive-service-rpc
org.apache.hive:hive-shims-0.23
org.apache.hive:hive-shims
org.apache.hive:hive-common
org.apache.hive:hive-shims-scheduler
org.apache.hive:hive-storage-api
org.apache.hive:hive-vector-code-gen
org.datanucleus:javax.jdo
com.tdunning:json
org.apache.velocity:velocity
org.apache.yetus:audience-annotations

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 @@ -516,6 +522,7 @@ Common Development and Distribution License (CDDL) 1.1

javax.el:javax.el-api https://javaee.github.io/uel-ri/
javax.servlet:javax.servlet-api https://javaee.github.io/servlet-spec/
javax.servlet.jsp:jsp-api
javax.transaction:jta http://www.oracle.com/technetwork/java/index.html
javax.xml.bind:jaxb-api https://github.com/javaee/jaxb-v2
org.glassfish.hk2:hk2-api https://github.com/javaee/glassfish
Expand Down Expand Up @@ -546,6 +553,7 @@ Eclipse Public License (EPL) 2.0

jakarta.annotation:jakarta-annotation-api https://projects.eclipse.org/projects/ee4j.ca
jakarta.ws.rs:jakarta.ws.rs-api https://github.com/eclipse-ee4j/jaxrs-api
org.glassfish.hk2.external:jakarta.inject


Python Software Foundation License
Expand Down
31 changes: 29 additions & 2 deletions NOTICE-binary
Expand Up @@ -65,8 +65,8 @@ Copyright 2009-2014 The Apache Software Foundation
Objenesis
Copyright 2006-2013 Joe Walnes, Henri Tremblay, Leonardo Mesquita

Apache XBean :: ASM 5 shaded (repackaged)
Copyright 2005-2015 The Apache Software Foundation
Apache XBean :: ASM shaded (repackaged)
Copyright 2005-2019 The Apache Software Foundation

--------------------------------------

Expand Down Expand Up @@ -661,6 +661,9 @@ Copyright 2017 The Apache Software Foundation
Apache Commons CLI
Copyright 2001-2009 The Apache Software Foundation

Apache Commons Daemon
Copyright 1999-2019 The Apache Software Foundation

Google Guice - Extensions - Servlet
Copyright 2006-2011 Google, Inc.

Expand Down Expand Up @@ -1140,18 +1143,36 @@ limitations under the License.
dropwizard-metrics-hadoop-metrics2-reporter
Copyright 2016 Josh Elser

Hive Beeline
Copyright 2019 The Apache Software Foundation

Hive CLI
Copyright 2019 The Apache Software Foundation

Hive Common
Copyright 2019 The Apache Software Foundation

Hive JDBC
Copyright 2019 The Apache Software Foundation

Hive Query Language
Copyright 2019 The Apache Software Foundation

Hive Llap Common
Copyright 2019 The Apache Software Foundation

Hive Metastore
Copyright 2019 The Apache Software Foundation

Hive Serde
Copyright 2019 The Apache Software Foundation

Hive Service RPC
Copyright 2019 The Apache Software Foundation

Hive Shims
Copyright 2019 The Apache Software Foundation

Hive Shims 0.23
Copyright 2019 The Apache Software Foundation

Expand Down Expand Up @@ -1359,6 +1380,12 @@ Copyright 2019 The Apache Software Foundation
See the License for the specific language governing permissions and
limitations under the License.

Android JSON library
Copyright (C) 2010 The Android Open Source Project

This product includes software developed by
The Android Open Source Project

Apache Velocity

Copyright (C) 2000-2007 The Apache Software Foundation
Expand Down
35 changes: 25 additions & 10 deletions dev/deps/spark-deps-hadoop-3.2
@@ -1,18 +1,16 @@
HikariCP-2.5.1.jar
JLargeArrays-1.5.jar
JTransforms-3.1.jar
JavaEWAH-0.3.2.jar
RoaringBitmap-0.7.45.jar
ST4-4.0.4.jar
accessors-smart-1.2.jar
activation-1.1.1.jar
aircompressor-0.10.jar
algebra_2.12-2.0.0-M2.jar
antlr-2.7.7.jar
antlr-runtime-3.4.jar
antlr-runtime-3.5.2.jar
antlr4-runtime-4.7.1.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.5.0.jar
apache-log4j-extras-1.2.17.jar
arpack_combined_all-0.1.jar
arrow-format-0.12.0.jar
arrow-memory-0.12.0.jar
Expand Down Expand Up @@ -52,11 +50,12 @@ core-1.1.2.jar
curator-client-2.13.0.jar
curator-framework-2.13.0.jar
curator-recipes-2.13.0.jar
datanucleus-api-jdo-3.2.6.jar
datanucleus-api-jdo-4.2.4.jar
datanucleus-core-4.1.17.jar
datanucleus-rdbms-3.2.9.jar
datanucleus-rdbms-4.1.19.jar
derby-10.12.1.1.jar
dnsjava-2.1.7.jar
dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
ehcache-3.3.1.jar
flatbuffers-java-1.9.0.jar
generex-1.0.2.jar
Expand All @@ -79,7 +78,21 @@ hadoop-yarn-common-3.2.0.jar
hadoop-yarn-registry-3.2.0.jar
hadoop-yarn-server-common-3.2.0.jar
hadoop-yarn-server-web-proxy-3.2.0.jar
hive-beeline-2.3.6.jar
hive-cli-2.3.6.jar
hive-common-2.3.6.jar
hive-exec-2.3.6-core.jar
hive-jdbc-2.3.6.jar
hive-llap-common-2.3.6.jar
hive-metastore-2.3.6.jar
hive-serde-2.3.6.jar
hive-service-rpc-2.3.6.jar
hive-shims-0.23-2.3.6.jar
hive-shims-2.3.6.jar
hive-shims-common-2.3.6.jar
hive-shims-scheduler-2.3.6.jar
hive-storage-api-2.6.0.jar
hive-vector-code-gen-2.3.6.jar
hk2-api-2.5.0.jar
hk2-locator-2.5.0.jar
hk2-utils-2.5.0.jar
Expand Down Expand Up @@ -108,6 +121,7 @@ janino-3.0.15.jar
javassist-3.22.0-CR2.jar
javax.el-3.0.1-b11.jar
javax.inject-1.jar
javax.jdo-3.2.0-m3.jar
javax.servlet-api-3.1.0.jar
javolution-5.5.1.jar
jaxb-api-2.2.11.jar
Expand All @@ -128,6 +142,7 @@ jline-2.14.6.jar
joda-time-2.9.3.jar
jodd-core-3.5.2.jar
jpam-1.1.jar
json-1.8.jar
json-smart-2.3.jar
json4s-ast_2.12-3.6.6.jar
json4s-core_2.12-3.6.6.jar
Expand Down Expand Up @@ -178,8 +193,8 @@ okhttp-2.7.5.jar
okhttp-3.8.1.jar
okio-1.13.0.jar
opencsv-2.3.jar
orc-core-1.5.6-nohive.jar
orc-mapreduce-1.5.6-nohive.jar
orc-core-1.5.6.jar
orc-mapreduce-1.5.6.jar
orc-shims-1.5.6.jar
oro-2.0.8.jar
osgi-resource-locator-1.0.3.jar
Expand All @@ -205,7 +220,6 @@ shims-0.7.45.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
snakeyaml-1.23.jar
snappy-0.2.jar
snappy-java-1.1.7.3.jar
spire-macros_2.12-0.17.0-M1.jar
spire-platform_2.12-0.17.0-M1.jar
Expand All @@ -214,11 +228,12 @@ spire_2.12-0.17.0-M1.jar
stax-api-1.0.1.jar
stax2-api-3.1.4.jar
stream-2.9.6.jar
stringtemplate-3.2.1.jar
super-csv-2.2.0.jar
token-provider-1.0.1.jar
transaction-api-1.1.jar
univocity-parsers-2.7.3.jar
validation-api-2.0.1.Final.jar
velocity-1.5.jar
woodstox-core-5.0.3.jar
xbean-asm7-shaded-4.14.jar
xz-1.5.jar
Expand Down
2 changes: 1 addition & 1 deletion dev/test-dependencies.sh
Expand Up @@ -75,7 +75,7 @@ for HADOOP_PROFILE in "${HADOOP_PROFILES[@]}"; do

echo "Generating dependency manifest for $HADOOP_PROFILE"
mkdir -p dev/pr-deps
$MVN $HADOOP2_MODULE_PROFILES -P$HADOOP_PROFILE dependency:build-classpath -pl assembly \
$MVN $HADOOP2_MODULE_PROFILES -P$HADOOP_PROFILE dependency:build-classpath -pl assembly -am \
| grep "Dependencies classpath:" -A 1 \
| tail -n 1 | tr ":" "\n" | rev | cut -d "/" -f 1 | rev | sort \
| grep -v spark > dev/pr-deps/spark-deps-$HADOOP_PROFILE
Expand Down

0 comments on commit ef81525

Please sign in to comment.