diff options
| -rw-r--r-- | assembly/pom.xml | 22 | ||||
| -rw-r--r-- | core/pom.xml | 48 | ||||
| -rw-r--r-- | examples/pom.xml | 103 | ||||
| -rw-r--r-- | network/common/pom.xml | 24 | ||||
| -rw-r--r-- | network/shuffle/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 22 | ||||
| -rw-r--r-- | streaming/pom.xml | 8 |
7 files changed, 81 insertions, 147 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 594fa0c779..1bb5a671f5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -43,12 +43,6 @@ </properties> <dependencies> - <!-- Promote Guava to compile scope in this module so it's included while shading. --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_${scala.binary.version}</artifactId> @@ -133,22 +127,6 @@ <goal>shade</goal> </goals> <configuration> - <relocations> - <relocation> - <pattern>com.google</pattern> - <shadedPattern>org.spark-project.guava</shadedPattern> - <includes> - <include>com.google.common.**</include> - </includes> - <excludes> - <exclude>com/google/common/base/Absent*</exclude> - <exclude>com/google/common/base/Function</exclude> - <exclude>com/google/common/base/Optional*</exclude> - <exclude>com/google/common/base/Present*</exclude> - <exclude>com/google/common/base/Supplier</exclude> - </excludes> - </relocation> - </relocations> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> diff --git a/core/pom.xml b/core/pom.xml index 1984682b9c..3c51b2d6b5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -106,16 +106,6 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> </dependency> - <!-- - Promote Guava to "compile" so that maven-shade-plugin picks it up (for packaging the Optional - class exposed in the Java API). The plugin will then remove this dependency from the published - pom, so that Guava does not pollute the client's compilation classpath. - --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -352,44 +342,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <artifactSet> - <includes> - <include>com.google.guava:guava</include> - </includes> - </artifactSet> - <filters> - <!-- See comment in the guava dependency declaration above. --> - <filter> - <artifact>com.google.guava:guava</artifact> - <includes> - <include>com/google/common/base/Absent*</include> - <include>com/google/common/base/Function</include> - <include>com/google/common/base/Optional*</include> - <include>com/google/common/base/Present*</include> - <include>com/google/common/base/Supplier</include> - </includes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - <!-- - Copy guava to the build directory. This is needed to make the SPARK_PREPEND_CLASSES - option work in compute-classpath.sh, since it would put the non-shaded Spark classes in - the runtime classpath. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> diff --git a/examples/pom.xml b/examples/pom.xml index 4b92147725..8caad2bc2e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -35,12 +35,6 @@ <url>http://spark.apache.org/</url> <dependencies> - <!-- Promote Guava to compile scope in this module so it's included while shading. --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_${scala.binary.version}</artifactId> @@ -310,69 +304,40 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <outputFile>${project.build.directory}/scala-${scala.binary.version}/spark-examples-${project.version}-hadoop${hadoop.version}.jar</outputFile> - <artifactSet> - <includes> - <include>*:*</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>com.google.guava:guava</artifact> - <excludes> - <!-- - Exclude all Guava classes so they're picked up from the main assembly. The - dependency still needs to be compile-scoped so that the relocation below - works. - --> - <exclude>**</exclude> - </excludes> - </filter> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <relocations> - <relocation> - <pattern>com.google</pattern> - <shadedPattern>org.spark-project.guava</shadedPattern> - <includes> - <include>com.google.common.**</include> - </includes> - <excludes> - <exclude>com.google.common.base.Optional**</exclude> - </excludes> - </relocation> - <relocation> - <pattern>org.apache.commons.math3</pattern> - <shadedPattern>org.spark-project.commons.math3</shadedPattern> - </relocation> - </relocations> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>reference.conf</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>log4j.properties</resource> - </transformer> - </transformers> - </configuration> - </execution> - </executions> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <outputFile>${project.build.directory}/scala-${scala.binary.version}/spark-examples-${project.version}-hadoop${hadoop.version}.jar</outputFile> + <artifactSet> + <includes> + <include>*:*</include> + </includes> + </artifactSet> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + </excludes> + </filter> + </filters> + <relocations combine.children="append"> + <relocation> + <pattern>org.apache.commons.math3</pattern> + <shadedPattern>org.spark-project.commons.math3</shadedPattern> + </relocation> + </relocations> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource>reference.conf</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>log4j.properties</resource> + </transformer> + </transformers> + </configuration> </plugin> </plugins> </build> diff --git a/network/common/pom.xml b/network/common/pom.xml index 245a96b8c4..5a9bbe105d 100644 --- a/network/common/pom.xml +++ b/network/common/pom.xml @@ -48,10 +48,15 @@ <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> + <!-- + Promote Guava to "compile" so that maven-shade-plugin picks it up (for packaging the Optional + class exposed in the Java API). The plugin will then remove this dependency from the published + pom, so that Guava does not pollute the client's compilation classpath. + --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <!-- Test dependencies --> @@ -88,11 +93,6 @@ <version>2.2</version> <executions> <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - <execution> <id>test-jar-on-test-compile</id> <phase>test-compile</phase> <goals> @@ -101,6 +101,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <artifactSet> + <includes> + <include>com.google.guava:guava</include> + </includes> + </artifactSet> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index 5bfa1ac9c3..c2d0300ecd 100644 --- a/network/shuffle/pom.xml +++ b/network/shuffle/pom.xml @@ -52,7 +52,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <scope>provided</scope> </dependency> <!-- Test dependencies --> @@ -1264,7 +1264,10 @@ </execution> </executions> </plugin> - <!-- The shade plug-in is used here to create effective pom's (see SPARK-3812). --> + <!-- + The shade plug-in is used here to create effective pom's (see SPARK-3812), and also + remove references from the shaded libraries from artifacts published by Spark. + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -1276,6 +1279,23 @@ <include>org.spark-project.spark:unused</include> </includes> </artifactSet> + <relocations> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.spark-project.guava</shadedPattern> + <excludes> + <!-- + These classes cannot be relocated, because the Java API exposes the + "Optional" type; the others are referenced by the Optional class. + --> + <exclude>com/google/common/base/Absent*</exclude> + <exclude>com/google/common/base/Function</exclude> + <exclude>com/google/common/base/Optional*</exclude> + <exclude>com/google/common/base/Present*</exclude> + <exclude>com/google/common/base/Supplier</exclude> + </excludes> + </relocation> + </relocations> </configuration> <executions> <execution> diff --git a/streaming/pom.xml b/streaming/pom.xml index 22b0d714b5..98f5b41de8 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -95,6 +95,14 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <shadeTestJar>true</shadeTestJar> + </configuration> + </plugin> </plugins> <resources> <resource> |