Skip to content

Commit 2434f16

Browse files
steveloughransrowen
authored andcommitted
[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 <[email protected]> Closes #11473 from steveloughran/fixes/SPARK-13599-groovy+branch-1.6.
1 parent 18ef2f2 commit 2434f16

File tree

6 files changed

+20
-5
lines changed

6 files changed

+20
-5
lines changed

dev/deps/spark-deps-hadoop-1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ eigenbase-properties-1.1.5.jar
5858
geronimo-annotation_1.0_spec-1.1.1.jar
5959
geronimo-jaspic_1.0_spec-1.0.jar
6060
geronimo-jta_1.1_spec-1.1.1.jar
61-
groovy-all-2.1.6.jar
6261
hadoop-client-1.2.1.jar
6362
hadoop-core-1.2.1.jar
6463
hsqldb-1.8.0.10.jar

dev/deps/spark-deps-hadoop-2.2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ grizzly-http-2.1.2.jar
6464
grizzly-http-server-2.1.2.jar
6565
grizzly-http-servlet-2.1.2.jar
6666
grizzly-rcm-2.1.2.jar
67-
groovy-all-2.1.6.jar
6867
guice-3.0.jar
6968
guice-servlet-3.0.jar
7069
hadoop-annotations-2.2.0.jar

dev/deps/spark-deps-hadoop-2.3

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ eigenbase-properties-1.1.5.jar
5959
geronimo-annotation_1.0_spec-1.1.1.jar
6060
geronimo-jaspic_1.0_spec-1.0.jar
6161
geronimo-jta_1.1_spec-1.1.1.jar
62-
groovy-all-2.1.6.jar
6362
guice-3.0.jar
6463
guice-servlet-3.0.jar
6564
hadoop-annotations-2.3.0.jar

dev/deps/spark-deps-hadoop-2.4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ eigenbase-properties-1.1.5.jar
5959
geronimo-annotation_1.0_spec-1.1.1.jar
6060
geronimo-jaspic_1.0_spec-1.0.jar
6161
geronimo-jta_1.1_spec-1.1.1.jar
62-
groovy-all-2.1.6.jar
6362
guice-3.0.jar
6463
guice-servlet-3.0.jar
6564
hadoop-annotations-2.4.0.jar

dev/deps/spark-deps-hadoop-2.6

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ eigenbase-properties-1.1.5.jar
6363
geronimo-annotation_1.0_spec-1.1.1.jar
6464
geronimo-jaspic_1.0_spec-1.0.jar
6565
geronimo-jta_1.1_spec-1.1.1.jar
66-
groovy-all-2.1.6.jar
6766
gson-2.2.4.jar
6867
guice-3.0.jar
6968
guice-servlet-3.0.jar

pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,6 +1407,10 @@
14071407
<groupId>commons-logging</groupId>
14081408
<artifactId>commons-logging</artifactId>
14091409
</exclusion>
1410+
<exclusion>
1411+
<groupId>org.codehaus.groovy</groupId>
1412+
<artifactId>groovy-all</artifactId>
1413+
</exclusion>
14101414
</exclusions>
14111415
</dependency>
14121416
<dependency>
@@ -1478,6 +1482,10 @@
14781482
<groupId>commons-logging</groupId>
14791483
<artifactId>commons-logging</artifactId>
14801484
</exclusion>
1485+
<exclusion>
1486+
<groupId>org.codehaus.groovy</groupId>
1487+
<artifactId>groovy-all</artifactId>
1488+
</exclusion>
14811489
</exclusions>
14821490
</dependency>
14831491

@@ -1572,6 +1580,10 @@
15721580
<groupId>commons-logging</groupId>
15731581
<artifactId>commons-logging</artifactId>
15741582
</exclusion>
1583+
<exclusion>
1584+
<groupId>org.codehaus.groovy</groupId>
1585+
<artifactId>groovy-all</artifactId>
1586+
</exclusion>
15751587
</exclusions>
15761588
</dependency>
15771589

@@ -1617,6 +1629,10 @@
16171629
<groupId>org.apache.thrift</groupId>
16181630
<artifactId>libthrift</artifactId>
16191631
</exclusion>
1632+
<exclusion>
1633+
<groupId>org.codehaus.groovy</groupId>
1634+
<artifactId>groovy-all</artifactId>
1635+
</exclusion>
16201636
</exclusions>
16211637
</dependency>
16221638

@@ -1665,6 +1681,10 @@
16651681
<groupId>commons-logging</groupId>
16661682
<artifactId>commons-logging</artifactId>
16671683
</exclusion>
1684+
<exclusion>
1685+
<groupId>org.codehaus.groovy</groupId>
1686+
<artifactId>groovy-all</artifactId>
1687+
</exclusion>
16681688
</exclusions>
16691689
</dependency>
16701690
<dependency>

0 commit comments

Comments
 (0)