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 /common | |
| 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 'common')
| -rw-r--r-- | common/network-yarn/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 3cb44324f2..bc83ef24c3 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -36,7 +36,7 @@ <!-- Make sure all Hadoop dependencies are provided to avoid repackaging. --> <hadoop.deps.scope>provided</hadoop.deps.scope> <shuffle.jar>${project.build.directory}/scala-${scala.binary.version}/spark-${project.version}-yarn-shuffle.jar</shuffle.jar> - <shade>org/spark-project/</shade> + <shade>org/spark_project/</shade> </properties> <dependencies> @@ -91,7 +91,7 @@ <relocations> <relocation> <pattern>com.fasterxml.jackson</pattern> - <shadedPattern>org.spark-project.com.fasterxml.jackson</shadedPattern> + <shadedPattern>${spark.shade.packageName}.com.fasterxml.jackson</shadedPattern> <includes> <include>com.fasterxml.jackson.**</include> </includes> |