Skip to content

Feat/op 3604 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

Feat/op 3604 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7bf7ed
fixed the other critical vulnerability
jainshashank24 Jul 5, 2021
6c0fd30
fixed the other critical vulnerability
jainshashank24 Jul 5, 2021
e414919
fixed the other critical vulnerability
jainshashank24 Jul 5, 2021
ba20fee
fixed the other critical vulnerability
jainshashank24 Jul 7, 2021
70bb4ed
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
365796d
pick the fix
jainshashank24 Jul 27, 2021
9a4fe1f
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
5372a69
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
f48afaf
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
d12ef08
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
539efab
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
97c4871
fixed the other critical vulnerability
jainshashank24 Jul 27, 2021
93cf0df
fixed the other critical vulnerability
jainshashank24 Jul 28, 2021
6594ad5
fixed the other critical vulnerability
jainshashank24 Jul 29, 2021
a3a6df5
fixed the other critical vulnerability
jainshashank24 Jul 29, 2021
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
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

Expand Down
8 changes: 7 additions & 1 deletion PysparkDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/



Expand Down
15 changes: 7 additions & 8 deletions dev/deps/spark-deps-hadoop-3.2-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file added htrace-core4-4.3.0-incubating-SNAPSHOT.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<!-- for now, not running scalafmt as part of default verify pipeline -->
<scalafmt.skip>true</scalafmt.skip>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
<fasterxml.jackson.version>2.12.2</fasterxml.jackson.version>
<snappy.version>1.1.7.5</snappy.version>
<netlib.java.version>1.1.2</netlib.java.version>
<commons-codec.version>1.10</commons-codec.version>
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down