Skip to content

Commit

Permalink
Merge branch 'update-log4j' into '2.8.1.1' (merge request !33)
Browse files Browse the repository at this point in the history
update log4j dependency to 2.17.0
Fixes apache#26 

### Motivation


*Explain here the context, and why you're making that change. What is the problem you're trying to solve.*

### Modifications

*Describe the modifications you've done.*

### Verifying this change

- [ ] Make sure that the change passes the CI checks.

*(Please pick either of the following options)*

This change is a trivial rework / code cleanup without any test coverage.

*(or)*

This change is already covered by existing tests, such as *(please describe tests)*.

*(or)*

This change added tests and can be verified as follows:

*(example:)*
  - *Added integration tests for end-to-end deployment with large payloads (10MB)*
  - *Extended integration test for recovery after broker failure*

### Does this pull request potentially affect one of the following parts:

*If `yes` was chosen, please highlight the chan
  • Loading branch information
mayozhang committed Dec 20, 2021
2 parents 4d11858 + 153e8c0 commit 65a86ff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,11 @@ The Apache Software License, Version 2.0
- jakarta.validation-jakarta.validation-api-2.0.2.jar
- javax.validation-validation-api-1.1.0.Final.jar
* Log4J
- org.apache.logging.log4j-log4j-api-2.15.0.jar
- org.apache.logging.log4j-log4j-core-2.15.0.jar
- org.apache.logging.log4j-log4j-slf4j-impl-2.15.0.jar
- org.apache.logging.log4j-log4j-web-2.15.0.jar
- org.apache.logging.log4j-log4j-1.2-api-2.15.0.jar
- org.apache.logging.log4j-log4j-api-2.17.0.jar
- org.apache.logging.log4j-log4j-core-2.17.0.jar
- org.apache.logging.log4j-log4j-slf4j-impl-2.17.0.jar
- org.apache.logging.log4j-log4j-web-2.17.0.jar
- org.apache.logging.log4j-log4j-1.2-api-2.17.0.jar
* Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar
* BookKeeper
- org.apache.bookkeeper-bookkeeper-common-4.14.2.jar
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ flexible messaging model and an intuitive client API.</description>
<rocksdb.version>6.10.2</rocksdb.version>
<slf4j.version>1.7.25</slf4j.version>
<commons.collections.version>3.2.2</commons.collections.version>
<log4j2.version>2.15.0</log4j2.version>
<log4j2.version>2.17.0</log4j2.version>
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastlefips.version>1.0.2</bouncycastlefips.version>
<jackson.version>2.12.3</jackson.version>
Expand Down

0 comments on commit 65a86ff

Please sign in to comment.