Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.

Commit 80ca09b

Browse files
author
yeyuqiang
authored
update log4j version (#26)
1 parent f28c42a commit 80ca09b

File tree

4 files changed

+58
-18
lines changed

4 files changed

+58
-18
lines changed

columnar_format_qat_wrapper/5.14.2/hive/pom.xml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
<kryo.version>2.22</kryo.version>
159159
<libfb303.version>${cdh.thrift.version}</libfb303.version>
160160
<libthrift.version>${cdh.thrift.version}</libthrift.version>
161-
<log4j.version>1.2.16</log4j.version>
162-
<log4j-extras.version>1.2.17</log4j-extras.version>
161+
<log4j.version>2.16.0</log4j.version>
162+
<log4j-extras.version>2.16.0</log4j-extras.version>
163163
<opencsv.version>2.3</opencsv.version>
164164
<mockito-all.version>1.9.5</mockito-all.version>
165165
<mina.version>2.0.0-M5</mina.version>
@@ -168,7 +168,7 @@
168168
<pig.version>${cdh.pig.version}</pig.version>
169169
<protobuf.version>${cdh.protobuf.version}</protobuf.version>
170170
<stax.version>1.0.1</stax.version>
171-
<slf4j.version>${cdh.slf4j.version}</slf4j.version>
171+
<slf4j.version>2.16.0</slf4j.version>
172172
<ST4.version>4.0.4</ST4.version>
173173
<tez.version>0.5.2</tez.version>
174174
<super-csv.version>2.2.0</super-csv.version>
@@ -601,13 +601,8 @@
601601
<version>${mockito-all.version}</version>
602602
</dependency>
603603
<dependency>
604-
<groupId>org.slf4j</groupId>
605-
<artifactId>slf4j-api</artifactId>
606-
<version>${slf4j.version}</version>
607-
</dependency>
608-
<dependency>
609-
<groupId>org.slf4j</groupId>
610-
<artifactId>slf4j-log4j12</artifactId>
604+
<groupId>org.apache.logging.log4j</groupId>
605+
<artifactId>log4j-slf4j-impl</artifactId>
611606
<version>${slf4j.version}</version>
612607
</dependency>
613608
<dependency>
@@ -627,13 +622,8 @@
627622
<!-- dependencies are always listed in sorted order by groupId, artifectId -->
628623
<!-- global dependencies -->
629624
<dependency>
630-
<groupId>org.slf4j</groupId>
631-
<artifactId>slf4j-api</artifactId>
632-
<version>${slf4j.version}</version>
633-
</dependency>
634-
<dependency>
635-
<groupId>org.slf4j</groupId>
636-
<artifactId>slf4j-log4j12</artifactId>
625+
<groupId>org.apache.logging.log4j</groupId>
626+
<artifactId>log4j-slf4j-impl</artifactId>
637627
<version>${slf4j.version}</version>
638628
</dependency>
639629
<dependency>

columnar_format_qat_wrapper/5.14.2/parquet-mr/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<hadoop.version>${cdh.hadoop.version}</hadoop.version>
142142
<cascading.version>2.5.3</cascading.version>
143143
<parquet.format.version>${cdh.parquet-format.version}</parquet.format.version>
144-
<log4j.version>1.2.17</log4j.version>
144+
<log4j.version>2.16.0</log4j.version>
145145
<previous.version>1.5.0-cdh5.2.0</previous.version>
146146
<thrift.executable>thrift</thrift.executable>
147147
<protoc.executable>protoc</protoc.executable>

hadoop_qat_wrapper/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,25 @@
4747
<artifactId>hadoop-common</artifactId>
4848
<scope>compile</scope>
4949
<version>2.6.0-cdh5.14.2</version>
50+
<exclusions>
51+
<exclusion>
52+
<groupId>log4j</groupId>
53+
<artifactId>log4j</artifactId>
54+
</exclusion>
55+
</exclusions>
5056
</dependency>
5157
<dependency>
5258
<groupId>org.apache.hadoop</groupId>
5359
<artifactId>hadoop-common</artifactId>
5460
<scope>test</scope>
5561
<type>test-jar</type>
5662
<version>2.6.0-cdh5.14.2</version>
63+
<exclusions>
64+
<exclusion>
65+
<groupId>log4j</groupId>
66+
<artifactId>log4j</artifactId>
67+
</exclusion>
68+
</exclusions>
5769
</dependency>
5870
<dependency>
5971
<groupId>junit</groupId>

spark_qat_wrapper/pom.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@
165165
<artifactId>spark-core_${scala.binary.version}</artifactId>
166166
<version>${spark.version}</version>
167167
<scope>${spark-scope}</scope>
168+
<exclusions>
169+
<exclusion>
170+
<groupId>log4j</groupId>
171+
<artifactId>log4j</artifactId>
172+
</exclusion>
173+
<exclusion>
174+
<groupId>org.slf4j</groupId>
175+
<artifactId>slf4j-log4j12</artifactId>
176+
</exclusion>
177+
</exclusions>
168178
</dependency>
169179
<dependency>
170180
<groupId>org.apache.spark</groupId>
@@ -183,6 +193,12 @@
183193
<artifactId>spark-hive_${scala.binary.version}</artifactId>
184194
<version>${spark.version}</version>
185195
<scope>${spark-scope}</scope>
196+
<exclusions>
197+
<exclusion>
198+
<groupId>log4j</groupId>
199+
<artifactId>apache-log4j-extras</artifactId>
200+
</exclusion>
201+
</exclusions>
186202
</dependency>
187203
<dependency>
188204
<groupId>org.apache.spark</groupId>
@@ -208,6 +224,16 @@
208224
<version>${spark.version}</version>
209225
<type>test-jar</type>
210226
<scope>test</scope>
227+
<exclusions>
228+
<exclusion>
229+
<groupId>log4j</groupId>
230+
<artifactId>log4j</artifactId>
231+
</exclusion>
232+
<exclusion>
233+
<groupId>org.slf4j</groupId>
234+
<artifactId>slf4j-log4j12</artifactId>
235+
</exclusion>
236+
</exclusions>
211237
</dependency>
212238
<dependency>
213239
<groupId>org.apache.spark</groupId>
@@ -228,13 +254,25 @@
228254
<artifactId>hadoop-common</artifactId>
229255
<version>${hadoop-common.version}</version>
230256
<scope>compile</scope>
257+
<exclusions>
258+
<exclusion>
259+
<groupId>log4j</groupId>
260+
<artifactId>log4j</artifactId>
261+
</exclusion>
262+
</exclusions>
231263
</dependency>
232264
<dependency>
233265
<groupId>org.apache.hadoop</groupId>
234266
<artifactId>hadoop-common</artifactId>
235267
<version>${hadoop-common.version}</version>
236268
<type>test-jar</type>
237269
<scope>test</scope>
270+
<exclusions>
271+
<exclusion>
272+
<groupId>log4j</groupId>
273+
<artifactId>log4j</artifactId>
274+
</exclusion>
275+
</exclusions>
238276
</dependency>
239277
<dependency>
240278
<groupId>junit</groupId>

0 commit comments

Comments
 (0)