Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,6 @@
<properties>
<hive.deps.scope>provided</hive.deps.scope>
<hive.llap.scope>provided</hive.llap.scope>
<hive.jackson.scope>provided</hive.jackson.scope>
</properties>
</profile>
<profile>
<id>hive-jackson-provided</id>
<properties>
<hive.jackson.scope>provided</hive.jackson.scope>
</properties>
</profile>
<profile>
Expand Down
2 changes: 0 additions & 2 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions dev/make-distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class SparkLauncher extends AbstractLauncher<SparkLauncher> {
/** 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. */
Expand All @@ -74,7 +74,7 @@ public class SparkLauncher extends AbstractLauncher<SparkLauncher> {
/** 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. */
Expand Down
15 changes: 0 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@
<scalafmt.skip>true</scalafmt.skip>
<scalafmt.validateOnly>true</scalafmt.validateOnly>
<scalafmt.changedOnly>true</scalafmt.changedOnly>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<fasterxml.jackson.version>2.19.0</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.19.0</fasterxml.jackson.databind.version>
<ws.xmlschema.version>2.3.1</ws.xmlschema.version>
Expand Down Expand Up @@ -281,7 +280,6 @@
<hive.deps.scope>compile</hive.deps.scope>
<hive.storage.version>2.8.1</hive.storage.version>
<hive.storage.scope>compile</hive.storage.scope>
<hive.jackson.scope>compile</hive.jackson.scope>
<hive.common.scope>compile</hive.common.scope>
<hive.llap.scope>test</hive.llap.scope>
<hive.serde.scope>compile</hive.serde.scope>
Expand Down Expand Up @@ -1623,19 +1621,6 @@
</exclusion>
</exclusions>
</dependency>
<!-- Hive 2.3 need this to init Hive's FunctionRegistry -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${codehaus.jackson.version}</version>
<scope>${hive.jackson.scope}</scope>
Copy link
Member

@wangyum wangyum May 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also remove <hive.jackson.scope>compile</hive.jackson.scope>?

spark/pom.xml

Line 270 in 44f00cc

<hive.jackson.scope>compile</hive.jackson.scope>

<hive.jackson.scope>provided</hive.jackson.scope>

https://github.com/apache/spark/blob/master/assembly/pom.xml#L272-L277

Copy link
Member Author

@pan3793 pan3793 May 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we identify some issues on hive 2.3.10 before 4.0.0 release, we may need to revert this patch and fallback to SPARK-47119 approach to mitigate CodeHaus Jackson dependencies vulnerabilities, see comemnts at
#45201 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link
Member

@dongjoon-hyun dongjoon-hyun May 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya, sorry for making things difficult, @pan3793 and @wangyum .

If we are sure, we can clean up later more easily definitely.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${codehaus.jackson.version}</version>
<scope>${hive.jackson.scope}</scope>
</dependency>
<dependency>
<groupId>${hive.group}</groupId>
<artifactId>hive-beeline</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions sql/hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<!-- transitive dependencies of hive-exec-core doesn't declare -->
<dependency>
<groupId>javax.servlet</groupId>
Expand Down