File tree Expand file tree Collapse file tree 4 files changed +2
-18
lines changed
launcher/src/main/java/org/apache/spark/launcher
resource-managers/kubernetes/docker/src/main/dockerfiles/spark Expand file tree Collapse file tree 4 files changed +2
-18
lines changed Original file line number Diff line number Diff line change 309309 <hive .jackson.scope>provided</hive .jackson.scope>
310310 </properties >
311311 </profile >
312- <profile >
313- <id >hive-jackson-provided</id >
314- <properties >
315- <hive .jackson.scope>provided</hive .jackson.scope>
316- </properties >
317- </profile >
318312 <profile >
319313 <id >orc-provided</id >
320314 <properties >
Original file line number Diff line number Diff line change @@ -204,14 +204,6 @@ echo "Build flags: $@" >> "$DISTDIR/RELEASE"
204204# Copy jars
205205cp -r " $SPARK_HOME " /assembly/target/scala* /jars/* " $DISTDIR /jars/"
206206
207- # Only create the hive-jackson directory if they exist.
208- if [ -f " $DISTDIR " /jars/jackson-core-asl-1.9.13.jar ]; then
209- for f in " $DISTDIR " /jars/jackson-* -asl-* .jar; do
210- mkdir -p " $DISTDIR " /hive-jackson
211- mv $f " $DISTDIR " /hive-jackson/
212- done
213- fi
214-
215207# Only create the yarn directory if the yarn artifacts were built.
216208if [ -f " $SPARK_HOME " /common/network-yarn/target/scala* /spark-* -yarn-shuffle.jar ]; then
217209 mkdir " $DISTDIR /yarn"
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ public class SparkLauncher extends AbstractLauncher<SparkLauncher> {
5959 /** Configuration key for the driver default extra class path. */
6060 public static final String DRIVER_DEFAULT_EXTRA_CLASS_PATH =
6161 "spark.driver.defaultExtraClassPath" ;
62- public static final String DRIVER_DEFAULT_EXTRA_CLASS_PATH_VALUE = "hive-jackson/* " ;
62+ public static final String DRIVER_DEFAULT_EXTRA_CLASS_PATH_VALUE = "" ;
6363 /** Configuration key for the driver class path. */
6464 public static final String DRIVER_EXTRA_CLASSPATH = "spark.driver.extraClassPath" ;
6565 /** Configuration key for the default driver VM options. */
@@ -74,7 +74,7 @@ public class SparkLauncher extends AbstractLauncher<SparkLauncher> {
7474 /** Configuration key for the executor default extra class path. */
7575 public static final String EXECUTOR_DEFAULT_EXTRA_CLASS_PATH =
7676 "spark.executor.defaultExtraClassPath" ;
77- public static final String EXECUTOR_DEFAULT_EXTRA_CLASS_PATH_VALUE = "hive-jackson/* " ;
77+ public static final String EXECUTOR_DEFAULT_EXTRA_CLASS_PATH_VALUE = "" ;
7878 /** Configuration key for the executor class path. */
7979 public static final String EXECUTOR_EXTRA_CLASSPATH = "spark.executor.extraClassPath" ;
8080 /** Configuration key for the default executor VM options. */
Original file line number Diff line number Diff line change @@ -47,8 +47,6 @@ RUN set -ex && \
4747 rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/*
4848
4949COPY jars /opt/spark/jars
50- # Copy hive-jackson directory if exists
51- COPY hive-jackso[n] /opt/spark/hive-jackson
5250# Copy RELEASE file if exists
5351COPY RELEAS[E] /opt/spark/RELEASE
5452COPY bin /opt/spark/bin
You can’t perform that action at this time.
0 commit comments