Skip to content

Commit e7995c2

Browse files
committed
[SPARK-31633][BUILD] Upgrade SLF4J from 1.7.16 to 1.7.30
### What changes were proposed in this pull request? This PR aims to upgrade SLF4J from 1.7.16 to 1.7.30. ### Why are the changes needed? SLF4J 1.7.23+ is required to enable `slf4j-log4j12` with MDC feature to run under Java 9. Also, this will bring all latest bug fixes. - http://www.slf4j.org/news.html > When running under Java 9, log4j version 1.2.x is unable to correctly parse the "java.version" system property. Assuming an inccorect Java version, it proceeded to disable its MDC functionality. The slf4j-log4j12 module shipping in this release fixes the issue by tweaking MDC internals by reflection, allowing log4j to run under Java 9. See also SLF4J-393. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the Jenkins with the existing tests. Closes #28446 from dongjoon-hyun/SPARK-31633. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 02a319d commit e7995c2

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

dev/deps/spark-deps-hadoop-2.7-hive-1.2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ javax.servlet-api/3.1.0//javax.servlet-api-3.1.0.jar
112112
javolution/5.5.1//javolution-5.5.1.jar
113113
jaxb-api/2.2.2//jaxb-api-2.2.2.jar
114114
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
115-
jcl-over-slf4j/1.7.16//jcl-over-slf4j-1.7.16.jar
115+
jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar
116116
jdo-api/3.0.1//jdo-api-3.0.1.jar
117117
jersey-client/2.30//jersey-client-2.30.jar
118118
jersey-common/2.30//jersey-common-2.30.jar
@@ -135,7 +135,7 @@ json4s-scalap_2.12/3.6.6//json4s-scalap_2.12-3.6.6.jar
135135
jsp-api/2.1//jsp-api-2.1.jar
136136
jsr305/3.0.0//jsr305-3.0.0.jar
137137
jta/1.1//jta-1.1.jar
138-
jul-to-slf4j/1.7.16//jul-to-slf4j-1.7.16.jar
138+
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
139139
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
140140
kubernetes-client/4.7.1//kubernetes-client-4.7.1.jar
141141
kubernetes-model-common/4.7.1//kubernetes-model-common-4.7.1.jar
@@ -184,8 +184,8 @@ scala-reflect/2.12.10//scala-reflect-2.12.10.jar
184184
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
185185
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
186186
shims/0.7.45//shims-0.7.45.jar
187-
slf4j-api/1.7.16//slf4j-api-1.7.16.jar
188-
slf4j-log4j12/1.7.16//slf4j-log4j12-1.7.16.jar
187+
slf4j-api/1.7.30//slf4j-api-1.7.30.jar
188+
slf4j-log4j12/1.7.30//slf4j-log4j12-1.7.30.jar
189189
snakeyaml/1.24//snakeyaml-1.24.jar
190190
snappy-java/1.1.7.3//snappy-java-1.1.7.3.jar
191191
snappy/0.2//snappy-0.2.jar

dev/deps/spark-deps-hadoop-2.7-hive-2.3

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ javax.servlet-api/3.1.0//javax.servlet-api-3.1.0.jar
126126
javolution/5.5.1//javolution-5.5.1.jar
127127
jaxb-api/2.2.2//jaxb-api-2.2.2.jar
128128
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
129-
jcl-over-slf4j/1.7.16//jcl-over-slf4j-1.7.16.jar
129+
jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar
130130
jdo-api/3.0.1//jdo-api-3.0.1.jar
131131
jersey-client/2.30//jersey-client-2.30.jar
132132
jersey-common/2.30//jersey-common-2.30.jar
@@ -150,7 +150,7 @@ json4s-scalap_2.12/3.6.6//json4s-scalap_2.12-3.6.6.jar
150150
jsp-api/2.1//jsp-api-2.1.jar
151151
jsr305/3.0.0//jsr305-3.0.0.jar
152152
jta/1.1//jta-1.1.jar
153-
jul-to-slf4j/1.7.16//jul-to-slf4j-1.7.16.jar
153+
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
154154
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
155155
kubernetes-client/4.7.1//kubernetes-client-4.7.1.jar
156156
kubernetes-model-common/4.7.1//kubernetes-model-common-4.7.1.jar
@@ -198,8 +198,8 @@ scala-reflect/2.12.10//scala-reflect-2.12.10.jar
198198
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
199199
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
200200
shims/0.7.45//shims-0.7.45.jar
201-
slf4j-api/1.7.16//slf4j-api-1.7.16.jar
202-
slf4j-log4j12/1.7.16//slf4j-log4j12-1.7.16.jar
201+
slf4j-api/1.7.30//slf4j-api-1.7.30.jar
202+
slf4j-log4j12/1.7.30//slf4j-log4j12-1.7.30.jar
203203
snakeyaml/1.24//snakeyaml-1.24.jar
204204
snappy-java/1.1.7.3//snappy-java-1.1.7.3.jar
205205
spire-macros_2.12/0.17.0-M1//spire-macros_2.12-0.17.0-M1.jar

dev/deps/spark-deps-hadoop-3.2-hive-2.3

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ javolution/5.5.1//javolution-5.5.1.jar
126126
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
127127
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
128128
jcip-annotations/1.0-1//jcip-annotations-1.0-1.jar
129-
jcl-over-slf4j/1.7.16//jcl-over-slf4j-1.7.16.jar
129+
jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar
130130
jdo-api/3.0.1//jdo-api-3.0.1.jar
131131
jersey-client/2.30//jersey-client-2.30.jar
132132
jersey-common/2.30//jersey-common-2.30.jar
@@ -148,7 +148,7 @@ json4s-scalap_2.12/3.6.6//json4s-scalap_2.12-3.6.6.jar
148148
jsp-api/2.1//jsp-api-2.1.jar
149149
jsr305/3.0.0//jsr305-3.0.0.jar
150150
jta/1.1//jta-1.1.jar
151-
jul-to-slf4j/1.7.16//jul-to-slf4j-1.7.16.jar
151+
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
152152
kerb-admin/1.0.1//kerb-admin-1.0.1.jar
153153
kerb-client/1.0.1//kerb-client-1.0.1.jar
154154
kerb-common/1.0.1//kerb-common-1.0.1.jar
@@ -214,8 +214,8 @@ scala-reflect/2.12.10//scala-reflect-2.12.10.jar
214214
scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
215215
shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
216216
shims/0.7.45//shims-0.7.45.jar
217-
slf4j-api/1.7.16//slf4j-api-1.7.16.jar
218-
slf4j-log4j12/1.7.16//slf4j-log4j12-1.7.16.jar
217+
slf4j-api/1.7.30//slf4j-api-1.7.30.jar
218+
slf4j-log4j12/1.7.30//slf4j-log4j12-1.7.30.jar
219219
snakeyaml/1.24//snakeyaml-1.24.jar
220220
snappy-java/1.1.7.3//snappy-java-1.1.7.3.jar
221221
spire-macros_2.12/0.17.0-M1//spire-macros_2.12-0.17.0-M1.jar

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<maven.compiler.target>${java.version}</maven.compiler.target>
118118
<maven.version>3.6.3</maven.version>
119119
<sbt.project.name>spark</sbt.project.name>
120-
<slf4j.version>1.7.16</slf4j.version>
120+
<slf4j.version>1.7.30</slf4j.version>
121121
<log4j.version>1.2.17</log4j.version>
122122
<hadoop.version>2.7.4</hadoop.version>
123123
<protobuf.version>2.5.0</protobuf.version>

0 commit comments

Comments
 (0)