Skip to content

Commit

Permalink
Update log4j (hyperledger#3151)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
  • Loading branch information
ajsutton authored Dec 10, 2021
1 parent 9147b67 commit 05e05ae
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
### Additions and Improvements
- Represent baseFee as Wei instead of long accordingly to the spec [#2785] (https://github.com/hyperledger/besu/issues/2785)

### Bug Fixes
- Updated log4j to 2.15.0 and disabled JNDI message format lookups to improve security.

### <Next RC> Breaking Changes
- Plugin API: BlockHeader.getBaseFee() method now returns an optional Wei instead of an optional Long

Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,8 @@ applicationDefaultJvmArgs = [
// We shutdown log4j ourselves, as otherwise this shutdown hook runs before our own and whatever
// happens during shutdown is not logged.
'-Dlog4j.shutdownHookEnabled=false',
// Disable JNI lookups in log4j messages to improve security
'-Dlog4j2.formatMsgNoLookups=true',
// Redirect java.util.logging loggers to use log4j2.
'-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager',
// Suppress Java JPMS warnings. Document the reason for each suppression.
Expand Down
8 changes: 4 additions & 4 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ dependencyManagement {
dependency 'org.apache.commons:commons-compress:1.21'
dependency 'org.apache.commons:commons-text:1.9'

dependency 'org.apache.logging.log4j:log4j-api:2.14.1'
dependency 'org.apache.logging.log4j:log4j-core:2.14.1'
dependency 'org.apache.logging.log4j:log4j-jul:2.14.1'
dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
dependency 'org.apache.logging.log4j:log4j-api:2.15.0'
dependency 'org.apache.logging.log4j:log4j-core:2.15.0'
dependency 'org.apache.logging.log4j:log4j-jul:2.15.0'
dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0'

dependency 'org.apache.tuweni:tuweni-bytes:2.0.0'
dependency 'org.apache.tuweni:tuweni-config:2.0.0'
Expand Down

0 comments on commit 05e05ae

Please sign in to comment.