diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2016-04-06 19:33:48 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2016-04-06 19:33:51 -0700 |
| commit | 21d5ca128bf3afd5c2d4c7fcc56240e28443474f (patch) | |
| tree | db73dea769bed75e3e07a2869461685e9693a620 /pom.xml | |
| parent | d76592276f9f66fed8012d876595de8717f516a9 (diff) | |
| download | spark-21d5ca128bf3afd5c2d4c7fcc56240e28443474f.tar.gz spark-21d5ca128bf3afd5c2d4c7fcc56240e28443474f.tar.bz2 spark-21d5ca128bf3afd5c2d4c7fcc56240e28443474f.zip | |
[SPARK-14134][CORE] Change the package name used for shading classes.
The current package name uses a dash, which is a little weird but seemed
to work. That is, until a new test tried to mock a class that references
one of those shaded types, and then things started failing.
Most changes are just noise to fix the logging configs.
For reference, SPARK-8815 also raised this issue, although at the time it
did not cause any issues in Spark, so it was not addressed.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #11941 from vanzin/SPARK-14134.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -182,6 +182,9 @@ <test.java.home>${java.home}</test.java.home> <test.exclude.tags></test.exclude.tags> + <!-- Package to use when relocating shaded classes. --> + <spark.shade.packageName>org.spark_project</spark.shade.packageName> + <!-- Modules that copy jars to the build directory should do so under this location. --> <jars.target.dir>${project.build.directory}/scala-${scala.binary.version}/jars</jars.target.dir> @@ -2204,14 +2207,14 @@ <relocations> <relocation> <pattern>org.eclipse.jetty</pattern> - <shadedPattern>org.spark-project.jetty</shadedPattern> + <shadedPattern>${spark.shade.packageName}.jetty</shadedPattern> <includes> <include>org.eclipse.jetty.**</include> </includes> </relocation> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.spark-project.guava</shadedPattern> + <shadedPattern>${spark.shade.packageName}.guava</shadedPattern> </relocation> </relocations> </configuration> |