Merge pull request #76 from web3j/update_log4j_version

updates log4j version to protect against log4shell
hyperledger-web3j · Dec 13, 2021 · 27a6485 · 27a6485
2 parents 1ca086c + 6a043f2
commit 27a6485
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,16 +22,16 @@ ext {
     web3jVersion = '4.8.4'
     picocli = '4.0.4'
     slf4jVersion = '1.7.30'
-    junitVersion = '5.+'
-    mockitoVersion = '3.+'
+    junitVersion = '5.8.2'
+    mockitoVersion = '4.1.0'
     gsonVersion = '2.8.6'
     wireMockVersion = '2.25.1'
     kotlinLoggin = '1.7.9'
     dockerJavaVersion = '3.2.5'
     web3jEpirusVersion = '0.0.7'
     jaxbVersion = '2.2.11'
     activationVersion = '1.1.1'
-    log4jVersion = '1.2.17'
+    log4jVersion = '2.15.0'
     semverVersion = '0.9.0'
     commonsLangVersion = '3.9'
     jcdpVersion = '4.0.1'
@@ -99,7 +99,7 @@ dependencies {
             "com.google.code.gson:gson:$gsonVersion",
             "org.apache.commons:commons-lang3:$commonsLangVersion",
             "com.github.zafarkhaja:java-semver:$semverVersion",
-            "log4j:log4j:$log4jVersion",
+            "org.apache.logging.log4j:log4j-core:$log4jVersion",
             "io.github.microutils:kotlin-logging:$kotlinLoggin",
             "com.github.docker-java:docker-java:$dockerJavaVersion",
             "com.diogonunes:JCDP:$jcdpVersion"

diff --git a/src/main/resources/contracts/ERC20Token.sol b/src/main/resources/contracts/ERC20Token.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/src/main/resources/contracts/ERC777Token.sol b/src/main/resources/contracts/ERC777Token.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC777/ERC777.sol";