Merge pull request #98 from web3j/move_to_4.11.0

gtebrean · web-flow · commit a0fe375ea9e4 · 2024-02-20T20:00:23.000+02:00
Release to 1.5.1
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ mainClassName = 'org.web3j.console.Web3j'
 applicationName = 'web3j'
 
 ext {
-    web3jVersion = '4.10.1'
+    web3jVersion = '4.11.0'
     picocli = '4.6.0'
     slf4jVersion = '1.7.30'
     junitVersion = '5.8.2'
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version=1.5.0
+version=1.5.1
 group=org.web3j.console
diff --git a/src/main/java/org/web3j/console/account/AccountUtils.java b/src/main/java/org/web3j/console/account/AccountUtils.java
@@ -20,7 +20,7 @@
 
 import org.web3j.codegen.Console;
 import org.web3j.console.project.wallet.ProjectWallet;
-import org.web3j.crypto.CipherException;
+import org.web3j.crypto.exception.CipherException;
 
 public class AccountUtils {
     public static String accountDefaultWalletInit(
diff --git a/src/main/java/org/web3j/console/project/Project.java b/src/main/java/org/web3j/console/project/Project.java
@@ -18,7 +18,7 @@
 import java.security.NoSuchProviderException;
 
 import org.web3j.console.project.wallet.ProjectWallet;
-import org.web3j.crypto.CipherException;
+import org.web3j.crypto.exception.CipherException;
 
 public interface Project {
     void createProject()
diff --git a/src/main/java/org/web3j/console/project/utils/ProjectUtils.java b/src/main/java/org/web3j/console/project/utils/ProjectUtils.java
@@ -28,9 +28,9 @@
 import org.web3j.codegen.Console;
 import org.web3j.console.openapi.utils.PrettyPrinter;
 import org.web3j.console.openapi.utils.SimpleFileLogger;
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 
 public class ProjectUtils {
 
diff --git a/src/main/java/org/web3j/console/project/wallet/ProjectWallet.java b/src/main/java/org/web3j/console/project/wallet/ProjectWallet.java
@@ -18,8 +18,8 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 
 public class ProjectWallet {
 
diff --git a/src/main/java/org/web3j/console/wallet/WalletManager.java b/src/main/java/org/web3j/console/wallet/WalletManager.java
@@ -18,9 +18,9 @@
 
 import org.web3j.console.utils.ConsoleDevice;
 import org.web3j.console.utils.IODevice;
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 
 import static org.web3j.codegen.Console.exitError;
 
diff --git a/src/main/java/org/web3j/console/wallet/subcommands/WalletCreateCommand.java b/src/main/java/org/web3j/console/wallet/subcommands/WalletCreateCommand.java
@@ -24,8 +24,8 @@
 import org.web3j.console.Web3jVersionProvider;
 import org.web3j.console.utils.IODevice;
 import org.web3j.console.wallet.WalletManager;
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 
 /** Simple class for creating a wallet file. */
 @Command(
diff --git a/src/main/java/org/web3j/console/wallet/subcommands/WalletImportCommand.java b/src/main/java/org/web3j/console/wallet/subcommands/WalletImportCommand.java
@@ -22,9 +22,9 @@
 import org.web3j.console.Web3jVersionProvider;
 import org.web3j.console.utils.IODevice;
 import org.web3j.console.wallet.WalletManager;
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 import org.web3j.utils.Files;
 
 import static org.web3j.codegen.Console.exitError;
diff --git a/src/main/java/org/web3j/console/wallet/subcommands/WalletUpdateCommand.java b/src/main/java/org/web3j/console/wallet/subcommands/WalletUpdateCommand.java
@@ -21,9 +21,9 @@
 import org.web3j.console.Web3jVersionProvider;
 import org.web3j.console.utils.IODevice;
 import org.web3j.console.wallet.WalletManager;
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 
 import static org.web3j.codegen.Console.exitError;
 
diff --git a/src/main/resources/project/build.gradle.template b/src/main/resources/project/build.gradle.template
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     id 'application'
     id "com.github.johnrengelman.shadow" version "5.2.0"
-    id 'org.web3j' version '4.10.1'
+    id 'org.web3j' version '4.11.0'
 }
 
 
@@ -30,13 +30,13 @@ node {
 }
 
 ext {
-    web3jVersion = '4.10.1'
-    logbackVersion = '1.2.3'
+    web3jVersion = '4.11.0'
+    logbackVersion = '1.4.14'
     klaxonVersion = '5.5'
-    besuPluginVersion = '23.4.0'
-    besuInternalVersion = '23.4.0'
+    besuPluginVersion = '24.1.1'
+    besuInternalVersion = '24.1.1'
     besuInternalCryptoVersion = '23.1.3'
-    besuCryptoDepVersion = '0.7.1'
+    besuCryptoDepVersion = '0.8.3'
 }
 
 dependencies {
diff --git a/src/main/resources/project/build.gradleGenerateOpenApi.template b/src/main/resources/project/build.gradleGenerateOpenApi.template
@@ -1,5 +1,5 @@
 plugins {
-  id "org.web3j.openapi" version "4.10.1"
+  id "org.web3j.openapi" version "4.11.0"
 }
 
 group '<package_name>'
diff --git a/src/main/resources/project/build.gradleImport.template b/src/main/resources/project/build.gradleImport.template
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     id 'application'
     id "com.github.johnrengelman.shadow" version "5.2.0"
-    id 'org.web3j' version '4.10.1'
+    id 'org.web3j' version '4.11.0'
 }
 
 
@@ -30,13 +30,13 @@ node {
 }
 
 ext {
-    besuPluginVersion = '23.4.0'
-    besuInternalVersion = '23.4.0'
+    besuPluginVersion = '24.1.1'
+    besuInternalVersion = '24.1.1'
     besuInternalCryptoVersion = '23.1.3'
-    web3jVersion = '4.10.1'
-    logbackVersion = '1.2.3'
+    web3jVersion = '4.11.0'
+    logbackVersion = '1.4.14'
     klaxonVersion = '5.5'
-    besuCryptoDepVersion = '0.7.1'
+    besuCryptoDepVersion = '0.8.3'
 }
 
 dependencies {
diff --git a/src/main/resources/project/build.gradleImportOpenApi.template b/src/main/resources/project/build.gradleImportOpenApi.template
@@ -1,5 +1,5 @@
 plugins {
-  id "org.web3j.openapi" version "4.10.1"
+  id "org.web3j.openapi" version "4.11.0"
 }
 
 group '<package_name>'
diff --git a/src/main/resources/project/build.gradleJarOpenApi.template b/src/main/resources/project/build.gradleJarOpenApi.template
@@ -1,5 +1,5 @@
 plugins {
-  id "org.web3j.openapi" version "4.10.1"
+  id "org.web3j.openapi" version "4.11.0"
   id "com.github.johnrengelman.shadow" version "5.2.0"
 }
 
diff --git a/src/main/resources/project/build.gradleOpenApi.template b/src/main/resources/project/build.gradleOpenApi.template
@@ -1,5 +1,5 @@
 plugins {
-  id "org.web3j.openapi" version "4.10.1"
+  id "org.web3j.openapi" version "4.11.0"
 }
 
 group '<package_name>'
diff --git a/src/main/resources/project/erc20/build.gradleErc20.template b/src/main/resources/project/erc20/build.gradleErc20.template
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     id 'application'
     id "com.github.johnrengelman.shadow" version "5.2.0"
-    id 'org.web3j' version '4.10.1'
+    id 'org.web3j' version '4.11.0'
 }
 
 group '<package_name>'
@@ -29,13 +29,13 @@ node {
 }
 
 ext {
-    web3jVersion = '4.10.1'
-    logbackVersion = '1.2.3'
+    web3jVersion = '4.11.0'
+    logbackVersion = '1.4.14'
     klaxonVersion = '5.5'
-    besuPluginVersion = '23.4.0'
-    besuInternalVersion = '23.4.0'
+    besuPluginVersion = '24.1.1'
+    besuInternalVersion = '24.1.1'
     besuInternalCryptoVersion = '23.1.3'
-    besuCryptoDepVersion = '0.7.1'
+    besuCryptoDepVersion = '0.8.3'
 }
 
 dependencies {
diff --git a/src/main/resources/project/erc20/build.gradleOpenApiErc20.template b/src/main/resources/project/erc20/build.gradleOpenApiErc20.template
@@ -1,5 +1,5 @@
 plugins {
-  id "org.web3j.openapi" version "4.10.1"
+  id "org.web3j.openapi" version "4.11.0"
 }
 
 group '<package_name>'
diff --git a/src/main/resources/project/erc777/build.gradleErc777.template b/src/main/resources/project/erc777/build.gradleErc777.template
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     id 'application'
     id "com.github.johnrengelman.shadow" version "5.2.0"
-    id 'org.web3j' version '4.10.1'
+    id 'org.web3j' version '4.11.0'
 }
 
 group '<package_name>'
@@ -30,8 +30,8 @@ node {
 }
 
 ext {
-    web3jVersion = '4.10.1'
-    logbackVersion = '1.2.3'
+    web3jVersion = '4.11.0'
+    logbackVersion = '1.4.14'
     klaxonVersion = '5.5'
 }
 
diff --git a/src/main/resources/project/erc777/build.gradleOpenApiErc777.template b/src/main/resources/project/erc777/build.gradleOpenApiErc777.template
@@ -1,5 +1,5 @@
 plugins {
-  id "org.web3j.openapi" version "4.10.1"
+  id "org.web3j.openapi" version "4.11.0"
 }
 
 group '<package_name>'
diff --git a/src/test/java/org/web3j/console/ProjectTest.java b/src/test/java/org/web3j/console/ProjectTest.java
@@ -23,8 +23,8 @@
 import org.web3j.console.config.ConfigManager;
 import org.web3j.console.project.utils.ClassExecutor;
 import org.web3j.console.project.utils.Folders;
-import org.web3j.crypto.CipherException;
 import org.web3j.crypto.WalletUtils;
+import org.web3j.crypto.exception.CipherException;
 
 public class ProjectTest extends ClassExecutor {
     protected static File workingDirectory = Folders.tempBuildFolder();

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-version=1.5.0`
	`1`	`+version=1.5.1`
`2`	`2`	`group=org.web3j.console`