This is an automated email from the ASF dual-hosted git repository. srowen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new fe99305 [SPARK-27556][BUILD] Exclude com.zaxxer:HikariCP-java7 from hadoop-yarn-server-web-proxy fe99305 is described below commit fe99305101fa01713021bc0ffae943066c07a0d0 Author: Yuming Wang <yumw...@ebay.com> AuthorDate: Fri Apr 26 12:15:39 2019 -0500 [SPARK-27556][BUILD] Exclude com.zaxxer:HikariCP-java7 from hadoop-yarn-server-web-proxy ## What changes were proposed in this pull request? There are two HikariCP packages in classpath when building with `-Phive -Pyarn -Phadoop-3.2`. The HikariCP dependency tree: ``` [INFO] | +- org.apache.hadoop:hadoop-yarn-server-web-proxy:jar:3.2.0:compile [INFO] | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:3.2.0:compile [INFO] | | +- org.apache.hadoop:hadoop-yarn-registry:jar:3.2.0:compile [INFO] | | | \- commons-daemon:commons-daemon:jar:1.0.13:compile [INFO] | | +- org.apache.geronimo.specs:geronimo-jcache_1.0_spec:jar:1.0-alpha-1:compile [INFO] | | +- org.ehcache:ehcache:jar:3.3.1:compile [INFO] | | +- com.zaxxer:HikariCP-java7:jar:2.4.12:compile ``` ``` [INFO] +- org.apache.hive:hive-metastore:jar:2.3.4:compile [INFO] | +- javolution:javolution:jar:5.5.1:compile [INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:compile [INFO] | +- com.jolbox:bonecp:jar:0.8.0.RELEASE:compile [INFO] | +- com.zaxxer:HikariCP:jar:2.5.1:compile ``` This pr exclude `com.zaxxer:HikariCP-java7` from `hadoop-yarn-server-web-proxy`. ## How was this patch tested? manual tests Closes #24450 from wangyum/SPARK-27556. Authored-by: Yuming Wang <yumw...@ebay.com> Signed-off-by: Sean Owen <sean.o...@databricks.com> --- dev/deps/spark-deps-hadoop-3.2 | 1 - pom.xml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/deps/spark-deps-hadoop-3.2 b/dev/deps/spark-deps-hadoop-3.2 index 8b3bd79..5874151 100644 --- a/dev/deps/spark-deps-hadoop-3.2 +++ b/dev/deps/spark-deps-hadoop-3.2 @@ -1,4 +1,3 @@ -HikariCP-java7-2.4.12.jar JavaEWAH-0.3.2.jar RoaringBitmap-0.7.45.jar ST4-4.0.4.jar diff --git a/pom.xml b/pom.xml index 5153957..91661cd 100644 --- a/pom.xml +++ b/pom.xml @@ -1210,6 +1210,11 @@ <groupId>com.sun.jersey.contribs</groupId> <artifactId>*</artifactId> </exclusion> + <!-- Hadoop-3.2 --> + <exclusion> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP-java7</artifactId> + </exclusion> </exclusions> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org