Skip to content

Commit

Permalink
[deps](log4j) Upgrade log4j 2 to 2.16.0 (#7394)
Browse files Browse the repository at this point in the history 
Upgrade log4j 2 to 2.16.0, the official strongly recommends upgrading to this version
  • Loading branch information
@hf200012
hf200012 authored Dec 14, 2021
1 parent d9c927f commit e64da03
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
6 changes: 5 additions & 1 deletion fe/fe-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ under the License.
<doris.home>${basedir}/../../</doris.home>
<fe_ut_parallel>1</fe_ut_parallel>
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
<log4j2.version>2.16.0</log4j2.version>
</properties>

<profiles>
Expand Down Expand Up @@ -74,7 +75,7 @@ under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -252,18 +253,21 @@ under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
Expand Down
7 changes: 4 additions & 3 deletions fe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ under the License.
<hive.version>2.3.7</hive.version>
<hadoop.version>2.8.0</hadoop.version>
<jmockit.version>1.49</jmockit.version>
<log4j2.version>2.16.0</log4j2.version>
</properties>

<profiles>
Expand Down Expand Up @@ -310,21 +311,21 @@ under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
Expand Down
7 changes: 4 additions & 3 deletions fe_plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ under the License.

<properties>
<doris.home>${env.DORIS_HOME}</doris.home>
<log4j2.version>2.16.0</log4j2.version>
</properties>
<profiles>
<!-- for custom internal repository -->
Expand Down Expand Up @@ -82,21 +83,21 @@ under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/log4j/log4j -->
Expand Down
5 changes: 3 additions & 2 deletions fs_brokers/apache_hdfs_broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<log4j2.version>2.16.0</log4j2.version>
</properties>

<profiles>
Expand Down Expand Up @@ -227,14 +228,14 @@ under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>${log4j2.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
Expand Down

0 comments on commit e64da03

Please sign in to comment.