You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/04/09 13:08:01 UTC
spark git commit: [minor] [examples] Avoid packaging duplicate
classes.
Repository: spark
Updated Branches:
refs/heads/master 53f6bb1df -> 470d7453a
[minor] [examples] Avoid packaging duplicate classes.
Add exclusions and explicit dependencies so that the examples
assembly does not duplicate classes already packaged in the main
assembly.
Also avoid relocating the commons-math3 package since it's already
a dependency of spark-core, and thus is already available in the
main assembly.
Author: Marcelo Vanzin <va...@cloudera.com>
Closes #5379 from vanzin/examples-deps and squashes the following commits:
12c258e [Marcelo Vanzin] [minor] [examples] Avoid re-packaging unneeded classes.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/470d7453
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/470d7453
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/470d7453
Branch: refs/heads/master
Commit: 470d7453a56c56a41b2851551fe1830065f88b2c
Parents: 53f6bb1
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Thu Apr 9 07:07:50 2015 -0400
Committer: Sean Owen <so...@cloudera.com>
Committed: Thu Apr 9 07:07:50 2015 -0400
----------------------------------------------------------------------
examples/pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 46 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/470d7453/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 7e93f0e..afd7c6d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -90,6 +90,12 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming-zeromq_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.spark-project.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -234,6 +240,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
@@ -263,6 +270,22 @@
<artifactId>compress-lzf</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -271,9 +294,21 @@
<artifactId>jline</artifactId>
</exclusion>
<exclusion>
+ <groupId>net.jpountz.lz4</groupId>
+ <artifactId>lz4</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.cassandra.deps</groupId>
<artifactId>avro</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -281,6 +316,17 @@
<artifactId>scopt_${scala.binary.version}</artifactId>
<version>3.2.0</version>
</dependency>
+
+ <!--
+ The following dependencies are already present in the Spark assembly, so we want to force
+ them to be provided.
+ -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -322,12 +368,6 @@
</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">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org