File tree 7 files changed +14
-10
lines changed
java/org/apache/hadoop/hive/llap/daemon/impl
test/org/apache/hadoop/hive/llap/daemon/impl
src/test/java/org/apache/hadoop/hive/metastore/utils
7 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 367
367
</dependency >
368
368
<dependency >
369
369
<groupId >org.apache.logging.log4j</groupId >
370
- <artifactId >log4j-core</artifactId >
370
+ <artifactId >log4j-core-test </artifactId >
371
371
<version >${log4j2.version} </version >
372
- <classifier >tests</classifier >
373
372
<scope >test</scope >
374
373
</dependency >
375
374
<dependency >
Original file line number Diff line number Diff line change 48
48
import org .apache .tez .common .security .TokenCache ;
49
49
import org .slf4j .Logger ;
50
50
import org .slf4j .LoggerFactory ;
51
- import org .slf4j .Marker ;
52
51
import org .slf4j .MDC ;
52
+ import org .slf4j .Marker ;
53
+ import org .slf4j .impl .StaticMarkerBinder ;
53
54
54
55
import java .io .IOException ;
55
56
import java .util .Collections ;
@@ -70,7 +71,7 @@ public class QueryTracker extends AbstractService {
70
71
71
72
private static final Logger LOG = LoggerFactory .getLogger (QueryTracker .class );
72
73
private static final Marker QUERY_COMPLETE_MARKER =
73
- new Log4jMarker (new Log4jQueryCompleteMarker ());
74
+ new Log4jMarker (StaticMarkerBinder . getSingleton (). getMarkerFactory (), new Log4jQueryCompleteMarker ());
74
75
75
76
/// Shared singleton MetricsSource instance for all DAG locks
76
77
private static final MetricsSource LOCK_METRICS ;
Original file line number Diff line number Diff line change 25
25
import org .apache .hadoop .security .token .Token ;
26
26
import org .apache .hive .testutils .junit .extensions .DoNothingTCPServer ;
27
27
import org .apache .hive .testutils .junit .extensions .DoNothingTCPServerExtension ;
28
- import org .apache .logging .log4j .junit .LoggerContextSource ;
28
+ import org .apache .logging .log4j .core . test . junit .LoggerContextSource ;
29
29
import org .apache .tez .common .security .TokenCache ;
30
30
31
31
import org .junit .jupiter .api .Test ;
Original file line number Diff line number Diff line change 175
175
<!-- Leaving libfb303 at 0.9.3 regardless of libthrift: As per THRIFT-4613 The Apache Thrift project does not publish items related to fb303 at this point -->
176
176
<libfb303 .version>0.9.3</libfb303 .version>
177
177
<libthrift .version>0.16.0</libthrift .version>
178
- <log4j2 .version>2.18.0 </log4j2 .version>
178
+ <log4j2 .version>2.23.1 </log4j2 .version>
179
179
<mariadb .version>2.5.0</mariadb .version>
180
180
<mssql .version>6.2.1.jre8</mssql .version>
181
181
<mysql .version>8.0.31</mysql .version>
Original file line number Diff line number Diff line change 412
412
</dependency >
413
413
<dependency >
414
414
<groupId >org.apache.logging.log4j</groupId >
415
- <artifactId >log4j-core</artifactId >
415
+ <artifactId >log4j-core-test </artifactId >
416
416
<version >${log4j2.version} </version >
417
- <classifier >tests</classifier >
417
+ <scope >test</scope >
418
+ </dependency >
419
+ <dependency >
420
+ <groupId >org.junit.vintage</groupId >
421
+ <artifactId >junit-vintage-engine</artifactId >
418
422
<scope >test</scope >
419
423
</dependency >
420
424
</dependencies >
Original file line number Diff line number Diff line change 44
44
import org .apache .logging .log4j .LogManager ;
45
45
import org .apache .logging .log4j .core .LoggerContext ;
46
46
import org .apache .logging .log4j .core .config .LoggerConfig ;
47
- import org .apache .logging .log4j .test .appender .ListAppender ;
47
+ import org .apache .logging .log4j .core . test .appender .ListAppender ;
48
48
import org .apache .thrift .TException ;
49
49
import org .hamcrest .core .IsNot ;
50
50
import org .junit .After ;
Original file line number Diff line number Diff line change 89
89
<junit .vintage.version>5.6.3</junit .vintage.version>
90
90
<libfb303 .version>0.9.3</libfb303 .version>
91
91
<libthrift .version>0.16.0</libthrift .version>
92
- <log4j2 .version>2.18.0 </log4j2 .version>
92
+ <log4j2 .version>2.23.1 </log4j2 .version>
93
93
<mockito-core .version>3.4.4</mockito-core .version>
94
94
<orc .version>1.8.5</orc .version>
95
95
<protobuf .version>3.24.4</protobuf .version>
You can’t perform that action at this time.
0 commit comments