diff --git a/Dockerfile b/Dockerfile index 70e94ee1bc8f1..105ce5f383664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,14 +44,13 @@ RUN apt-get update -y && \ rm -rf /opt/spark/jars/json-smart-2.3.jar && \ curl -fSL https://repo1.maven.org/maven2/net/minidev/json-smart/2.4.1/json-smart-2.4.1.jar -o json-smart-2.3.jar && \ mv json-smart-2.3.jar /opt/spark/jars/ && \ - rm -rf /opt/spark/jars/log4j-1.2.17.jar && \ - curl -fSL https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.8.2/log4j-core-2.8.2.jar -o log4j-core-2.8.2.jar && \ - mv log4j-core-2.8.2.jar /opt/spark/jars/ && \ rm -rf /opt/spark/jars/nimbus-jose-jwt-4.41.1.jar && \ curl -fSL https://repo1.maven.org/maven2/com/nimbusds/nimbus-jose-jwt/7.9/nimbus-jose-jwt-7.9.jar -o nimbus-jose-jwt-7.9.jar && \ mv nimbus-jose-jwt-7.9.jar /opt/spark/jars/ +COPY htrace-core4-4.3.0-incubating-SNAPSHOT.jar /opt/spark/jars/ + ENTRYPOINT [ "/opt/entrypoint.sh" ] diff --git a/PysparkDockerfile b/PysparkDockerfile index eff2e29a307ac..d8b370463c25a 100644 --- a/PysparkDockerfile +++ b/PysparkDockerfile @@ -49,7 +49,13 @@ RUN apt-get update -y && \ mv log4j-core-2.8.2.jar /opt/spark/jars/ && \ rm -rf /opt/spark/jars/nimbus-jose-jwt-4.41.1.jar && \ curl -fSL https://repo1.maven.org/maven2/com/nimbusds/nimbus-jose-jwt/7.9/nimbus-jose-jwt-7.9.jar -o nimbus-jose-jwt-7.9.jar && \ - mv nimbus-jose-jwt-7.9.jar /opt/spark/jars/ + mv nimbus-jose-jwt-7.9.jar /opt/spark/jars/ && \ + curl -fSL https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-1.2-api/2.14.1/log4j-1.2-api-2.14.1.jar -o log4j-1.2-api-2.14.1.jar && \ + mv log4j-1.2-api-2.14.1.jar /opt/spark/jars/ && \ + curl -fSL https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.14.1/log4j-core-2.14.1.jar -o log4j-core-2.14.1.jar && \ + mv log4j-core-2.14.1.jar /opt/spark/jars/ && \ + curl -fSL https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar -o log4j-api-2.14.1.jar && \ + mv log4j-api-2.14.1.jar /opt/spark/jars/ diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index a5b0bde5bb7be..eb6e2ed6b26b8 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -100,18 +100,17 @@ httpclient/4.5.6//httpclient-4.5.6.jar httpcore/4.4.12//httpcore-4.4.12.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar ivy/2.4.0//ivy-2.4.0.jar -jackson-annotations/2.10.0//jackson-annotations-2.10.0.jar +jackson-annotations/2.12.2//jackson-annotations-2.12.2.jar jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar -jackson-core/2.10.0//jackson-core-2.10.0.jar -jackson-databind/2.10.0//jackson-databind-2.10.0.jar -jackson-dataformat-yaml/2.10.0//jackson-dataformat-yaml-2.10.0.jar +jackson-core/2.12.2//jackson-core-2.12.2.jar +jackson-databind/2.12.2//jackson-databind-2.12.2.jar +jackson-dataformat-yaml/2.12.2//jackson-dataformat-yaml-2.12.2.jar jackson-datatype-jsr310/2.10.3//jackson-datatype-jsr310-2.10.3.jar jackson-jaxrs-base/2.9.5//jackson-jaxrs-base-2.9.5.jar jackson-jaxrs-json-provider/2.9.5//jackson-jaxrs-json-provider-2.9.5.jar jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar -jackson-module-jaxb-annotations/2.10.0//jackson-module-jaxb-annotations-2.10.0.jar -jackson-module-paranamer/2.10.0//jackson-module-paranamer-2.10.0.jar -jackson-module-scala_2.12/2.10.0//jackson-module-scala_2.12-2.10.0.jar +jackson-module-jaxb-annotations/2.12.2//jackson-module-jaxb-annotations-2.12.2.jar +jackson-module-scala_2.12/2.12.2//jackson-module-scala_2.12-2.12.2.jar jakarta.activation-api/1.2.1//jakarta.activation-api-1.2.1.jar jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar @@ -216,7 +215,7 @@ shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar shims/0.7.45//shims-0.7.45.jar slf4j-api/1.7.30//slf4j-api-1.7.30.jar slf4j-log4j12/1.7.30//slf4j-log4j12-1.7.30.jar -snakeyaml/1.24//snakeyaml-1.24.jar +snakeyaml/1.27//snakeyaml-1.27.jar snappy-java/1.1.7.5//snappy-java-1.1.7.5.jar spire-macros_2.12/0.17.0-M1//spire-macros_2.12-0.17.0-M1.jar spire-platform_2.12/0.17.0-M1//spire-platform_2.12-0.17.0-M1.jar diff --git a/htrace-core4-4.3.0-incubating-SNAPSHOT.jar b/htrace-core4-4.3.0-incubating-SNAPSHOT.jar new file mode 100644 index 0000000000000..0951d462ad9dd Binary files /dev/null and b/htrace-core4-4.3.0-incubating-SNAPSHOT.jar differ diff --git a/pom.xml b/pom.xml index 58e9f8126d9fa..e0cd324abd995 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ true 1.9.13 - 2.10.0 + 2.12.2 1.1.7.5 1.1.2 1.10 diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile index 075738e32a483..906240e646c2d 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile @@ -17,7 +17,7 @@ ARG java_image_tag=openjdk:8-jre-slim #FROM openjdk:${java_image_tag} -FROM adoptopenjdk:8u282-b08-jre-openj9-0.24.0 +FROM artifacts.ggn.in.guavus.com:4244/adoptopenjdk:8u282-b08-jre-openj9-0.24.0 ARG spark_uid=185