Repository: spark Updated Branches: refs/heads/branch-1.6 18ef2f25e -> 2434f16cc
[SPARK-13599][BUILD] remove transitive groovy dependencies from spark-hive and spark-hiveserver (branch 1.6) ## What changes were proposed in this pull request? This is just the patch of #11449 cherry picked to branch-1.6; the enforcer and dep/ diffs are cut Modifies the dependency declarations of the all the hive artifacts, to explicitly exclude the groovy-all JAR. This stops the groovy classes *and everything else in that uber-JAR* from getting into spark-assembly JAR. ## How was this patch tested? 1. Pre-patch build was made: `mvn clean install -Pyarn,hive,hive-thriftserver` 1. spark-assembly expanded, observed to have the org.codehaus.groovy packages and JARs 1. A maven dependency tree was created `mvn dependency:tree -Pyarn,hive,hive-thriftserver -Dverbose > target/dependencies.txt` 1. This text file examined to confirm that groovy was being imported as a dependency of `org.spark-project.hive` 1. Patch applied 1. Repeated step1: clean build of project with ` -Pyarn,hive,hive-thriftserver` set 1. Examined created spark-assembly, verified no org.codehaus packages 1. Verified that the maven dependency tree no longer references groovy The `master` version updates the dependency files and an enforcer rule to keep groovy out; this patch strips it out. Author: Steve Loughran <ste...@hortonworks.com> Closes #11473 from steveloughran/fixes/SPARK-13599-groovy+branch-1.6. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2434f16c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2434f16c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2434f16c Branch: refs/heads/branch-1.6 Commit: 2434f16cc743d10bb03eadc051dfd568ebe7a79e Parents: 18ef2f2 Author: Steve Loughran <ste...@hortonworks.com> Authored: Mon Mar 7 13:05:07 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Mon Mar 7 13:05:07 2016 +0000 ---------------------------------------------------------------------- dev/deps/spark-deps-hadoop-1 | 1 - dev/deps/spark-deps-hadoop-2.2 | 1 - dev/deps/spark-deps-hadoop-2.3 | 1 - dev/deps/spark-deps-hadoop-2.4 | 1 - dev/deps/spark-deps-hadoop-2.6 | 1 - pom.xml | 20 ++++++++++++++++++++ 6 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2434f16c/dev/deps/spark-deps-hadoop-1 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-1 b/dev/deps/spark-deps-hadoop-1 index d5e85ad..a8ae660 100644 --- a/dev/deps/spark-deps-hadoop-1 +++ b/dev/deps/spark-deps-hadoop-1 @@ -58,7 +58,6 @@ eigenbase-properties-1.1.5.jar geronimo-annotation_1.0_spec-1.1.1.jar geronimo-jaspic_1.0_spec-1.0.jar geronimo-jta_1.1_spec-1.1.1.jar -groovy-all-2.1.6.jar hadoop-client-1.2.1.jar hadoop-core-1.2.1.jar hsqldb-1.8.0.10.jar http://git-wip-us.apache.org/repos/asf/spark/blob/2434f16c/dev/deps/spark-deps-hadoop-2.2 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 0364905..ca75f91 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -64,7 +64,6 @@ grizzly-http-2.1.2.jar grizzly-http-server-2.1.2.jar grizzly-http-servlet-2.1.2.jar grizzly-rcm-2.1.2.jar -groovy-all-2.1.6.jar guice-3.0.jar guice-servlet-3.0.jar hadoop-annotations-2.2.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/2434f16c/dev/deps/spark-deps-hadoop-2.3 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index b3481ac..208ff53 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -59,7 +59,6 @@ eigenbase-properties-1.1.5.jar geronimo-annotation_1.0_spec-1.1.1.jar geronimo-jaspic_1.0_spec-1.0.jar geronimo-jta_1.1_spec-1.1.1.jar -groovy-all-2.1.6.jar guice-3.0.jar guice-servlet-3.0.jar hadoop-annotations-2.3.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/2434f16c/dev/deps/spark-deps-hadoop-2.4 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 7ddff07..e7075f8 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -59,7 +59,6 @@ eigenbase-properties-1.1.5.jar geronimo-annotation_1.0_spec-1.1.1.jar geronimo-jaspic_1.0_spec-1.0.jar geronimo-jta_1.1_spec-1.1.1.jar -groovy-all-2.1.6.jar guice-3.0.jar guice-servlet-3.0.jar hadoop-annotations-2.4.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/2434f16c/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 4e510bd..5ebf5d3 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -63,7 +63,6 @@ eigenbase-properties-1.1.5.jar geronimo-annotation_1.0_spec-1.1.1.jar geronimo-jaspic_1.0_spec-1.0.jar geronimo-jta_1.1_spec-1.1.1.jar -groovy-all-2.1.6.jar gson-2.2.4.jar guice-3.0.jar guice-servlet-3.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/2434f16c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a85037b..e6e2ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -1407,6 +1407,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1478,6 +1482,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </exclusion> </exclusions> </dependency> @@ -1572,6 +1580,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </exclusion> </exclusions> </dependency> @@ -1617,6 +1629,10 @@ <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </exclusion> </exclusions> </dependency> @@ -1665,6 +1681,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </exclusion> </exclusions> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
