diff --git a/LICENSE-binary b/LICENSE-binary index 0c3c7aecb71ac..b421b4ff68afd 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -365,8 +365,6 @@ org.apache.xbean:xbean-asm9-shaded org.apache.yetus:audience-annotations org.apache.zookeeper:zookeeper org.apache.zookeeper:zookeeper-jute -org.codehaus.jackson:jackson-core-asl -org.codehaus.jackson:jackson-mapper-asl org.datanucleus:datanucleus-api-jdo org.datanucleus:datanucleus-core org.datanucleus:datanucleus-rdbms diff --git a/assembly/pom.xml b/assembly/pom.xml index a85ac5d9bc837..3a6b73b4522db 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -306,13 +306,6 @@ provided provided - provided - - - - hive-jackson-provided - - provided diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 727746dcae6f7..7853be2c9d063 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -105,13 +105,11 @@ istack-commons-runtime/4.1.2//istack-commons-runtime-4.1.2.jar ivy/2.5.3//ivy-2.5.3.jar j2objc-annotations/3.0.0//j2objc-annotations-3.0.0.jar jackson-annotations/2.19.0//jackson-annotations-2.19.0.jar -jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar jackson-core/2.19.0//jackson-core-2.19.0.jar jackson-databind/2.19.0//jackson-databind-2.19.0.jar jackson-dataformat-cbor/2.19.0//jackson-dataformat-cbor-2.19.0.jar jackson-dataformat-yaml/2.19.0//jackson-dataformat-yaml-2.19.0.jar jackson-datatype-jsr310/2.19.0//jackson-datatype-jsr310-2.19.0.jar -jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar jackson-module-scala_2.13/2.19.0//jackson-module-scala_2.13-2.19.0.jar jakarta.activation-api/2.1.3//jakarta.activation-api-2.1.3.jar jakarta.annotation-api/2.1.1//jakarta.annotation-api-2.1.1.jar diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index 39f6477e07c97..911c3e6d068a6 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -204,14 +204,6 @@ echo "Build flags: $@" >> "$DISTDIR/RELEASE" # Copy jars cp -r "$SPARK_HOME"/assembly/target/scala*/jars/* "$DISTDIR/jars/" -# Only create the hive-jackson directory if they exist. -if [ -f "$DISTDIR"/jars/jackson-core-asl-1.9.13.jar ]; then - for f in "$DISTDIR"/jars/jackson-*-asl-*.jar; do - mkdir -p "$DISTDIR"/hive-jackson - mv $f "$DISTDIR"/hive-jackson/ - done -fi - # Only create the yarn directory if the yarn artifacts were built. if [ -f "$SPARK_HOME"/common/network-yarn/target/scala*/spark-*-yarn-shuffle.jar ]; then mkdir "$DISTDIR/yarn" diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java b/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java index 67f76a73c214d..c3cc470e8871d 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java +++ b/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java @@ -59,7 +59,7 @@ public class SparkLauncher extends AbstractLauncher { /** Configuration key for the driver default extra class path. */ public static final String DRIVER_DEFAULT_EXTRA_CLASS_PATH = "spark.driver.defaultExtraClassPath"; - public static final String DRIVER_DEFAULT_EXTRA_CLASS_PATH_VALUE = "hive-jackson/*"; + public static final String DRIVER_DEFAULT_EXTRA_CLASS_PATH_VALUE = ""; /** Configuration key for the driver class path. */ public static final String DRIVER_EXTRA_CLASSPATH = "spark.driver.extraClassPath"; /** Configuration key for the default driver VM options. */ @@ -74,7 +74,7 @@ public class SparkLauncher extends AbstractLauncher { /** Configuration key for the executor default extra class path. */ public static final String EXECUTOR_DEFAULT_EXTRA_CLASS_PATH = "spark.executor.defaultExtraClassPath"; - public static final String EXECUTOR_DEFAULT_EXTRA_CLASS_PATH_VALUE = "hive-jackson/*"; + public static final String EXECUTOR_DEFAULT_EXTRA_CLASS_PATH_VALUE = ""; /** Configuration key for the executor class path. */ public static final String EXECUTOR_EXTRA_CLASSPATH = "spark.executor.extraClassPath"; /** Configuration key for the default executor VM options. */ diff --git a/pom.xml b/pom.xml index ec0b9db3ca2aa..fc3b79eb5e44e 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,6 @@ true true true - 1.9.13 2.19.0 2.19.0 2.3.1 @@ -281,7 +280,6 @@ compile 2.8.1 compile - compile compile test compile @@ -1623,19 +1621,6 @@ - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - ${hive.jackson.scope} - - - org.codehaus.jackson - jackson-mapper-asl - ${codehaus.jackson.version} - ${hive.jackson.scope} - ${hive.group} hive-beeline diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile index 936359544320a..89696088f6a4c 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile @@ -47,8 +47,6 @@ RUN set -ex && \ rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* COPY jars /opt/spark/jars -# Copy hive-jackson directory if exists -COPY hive-jackso[n] /opt/spark/hive-jackson # Copy RELEASE file if exists COPY RELEAS[E] /opt/spark/RELEASE COPY bin /opt/spark/bin diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 45e1400f22108..537be46a50125 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -139,10 +139,6 @@ org.apache.httpcomponents httpclient - - org.codehaus.jackson - jackson-mapper-asl - javax.servlet