Merge pull request #2166 from LFDT-web3j/upgrade_java_21

Upgrade java 21 and besu 25.2.1

Author: gtebrean

.github/workflows/build.yml

@@ -15,11 +15,11 @@ jobs:
       registry.password: ${{ secrets.REGISTRY_PASSWORD }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:
@@ -34,11 +34,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

.github/workflows/codeql.yml

@@ -31,11 +31,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 21
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/publish-snapshot.yml

@@ -18,11 +18,11 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

.github/workflows/release.yml

@@ -17,19 +17,19 @@ jobs:
       - name: Build Workflow Dispatch
         uses: convictional/[email protected]
         with:
-          owner: hyperledger-web3j
+          owner: LFDT-web3j
           repo: web3j
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow_file_name: build.yml
           wait_interval: 10
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

CHANGELOG.md

@@ -3,19 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.13.1]() (2025-03-05)
+# [4.14.0]() (Upcoming)
 
 ### Bug Fixes
 
-* 
+* fix: ENS CCIP Read improvements [#2164](https://github.com/LFDT-web3j/web3j/pull/2164)
+
+
 ### Features
 
 * bump snapshot version to 4.13.1 [#2160](https://github.com/hyperledger-web3j/web3j/pull/2160)
 
 
 ### BREAKING CHANGES
 
-*
+* Upgrade to Java 21 and Besu 25.2.1 [#2165](https://github.com/LFDT-web3j/web3j/pull/2165)
 
 # [4.13.0](https://github.com/hyperledger-web3j/web3j/releases/tag/v4.13.0) (2025-03-05)
 

README.md

@@ -12,7 +12,7 @@ Web3j is a lightweight, highly modular, reactive, type safe Java and
 Android library for working with Smart Contracts and integrating with
 clients (nodes) on the Ethereum network:
 
-![image](https://github.com/hyperledger-web3j/web3j-docs/blob/main/docs/img/web3j_network.png)
+![image](https://github.com/LFDT-web3j/web3j-docs/blob/main/docs/img/web3j_network.png)
 
 This allows you to work with the [Ethereum](https://www.ethereum.org/)
 blockchain, without the additional overhead of having to write your own

build.gradle

@@ -13,7 +13,7 @@ plugins {
 
 
 ext {
-    bouncycastleVersion = '1.78.1'
+    bouncycastleVersion = '1.80'
     jacksonVersion = '2.17.1'
     javaPoetVersion = '1.13.0'
     kotlinVersion = '1.9.24'
@@ -50,7 +50,7 @@ description 'Web3j base project.'
     'spotless'
 ].each { buildScript ->
     download {
-        src "https://raw.githubusercontent.com/hyperledger-web3j/web3j-build-tools/main/gradle/$buildScript/build.gradle"
+        src "https://raw.githubusercontent.com/LFDT-web3j/web3j-build-tools/main/gradle/$buildScript/build.gradle"
         dest "$rootDir/gradle/$buildScript/build.gradle"
         overwrite false
         quiet true

codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java

@@ -120,7 +120,7 @@ public class SolidityFunctionWrapper extends Generator {
                     + "or the "
                     + SolidityFunctionWrapperGenerator.class.getName()
                     + " in the \n"
-                    + "<a href=\"https://github.com/hyperledger-web3j/web3j/tree/main/codegen\">"
+                    + "<a href=\"https://github.com/LFDT-web3j/web3j/tree/main/codegen\">"
                     + "codegen module</a> to update.\n";
 
     private final boolean useNativeJavaTypes;

codegen/src/test/resources/solidity/abifuncs/build/java/AbiFuncs.java

@@ -19,7 +19,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/arrayofstructandstruct/build/java/ArrayOfStructAndStruct.java

@@ -23,7 +23,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/arrayofstructclassgeneration/build/java/ArrayOfStructClassGeneration.java

@@ -23,7 +23,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java

@@ -33,7 +33,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java

@@ -31,7 +31,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/metacoin/build/java/MetaCoin.java

@@ -31,7 +31,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java

@@ -24,7 +24,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/sameinnerstructname/build/java/SameInnerStructName.java

@@ -23,7 +23,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

codegen/src/test/resources/solidity/staticarrayofstructsinstruct/build/java/StaticArrayOfStructsInStruct.java

@@ -27,7 +27,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/LFDT-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

gradle/java/build.gradle

@@ -1,7 +1,10 @@
 apply plugin: 'java'
 
-sourceCompatibility = 17
-targetCompatibility = 17
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
 
 compileJava {
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

gradle/repositories/build.gradle

@@ -3,7 +3,6 @@ repositories {
     maven {
         url = uri("https://plugins.gradle.org/m2/")
     }
-    jcenter()
     maven { url 'https://oss.sonatype.org/content/repositories/releases/' }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }

integration-tests/build.gradle

@@ -9,10 +9,11 @@ repositories {
     maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
 }
 ext {
-    besuPluginVersion = '24.1.1'
-    besuInternalVersion = '24.1.1'
+    besuPluginVersion = '25.2.1'
+    besuInternalVersion = '25.2.1'
     besuInternalCryptoVersion = '23.1.3'
-    besuCryptoDepVersion = '0.8.3'
+    besuCryptoDepVersion = '1.1.2'
+    besuBlsVersion = '1.0.0'
 }
 
 def withoutAbi = { exclude group: 'org.web3j', module: 'abi' }
@@ -41,7 +42,7 @@ dependencies {
     testImplementation "org.hyperledger.besu.internal:metrics-core:$besuInternalVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:trie:$besuInternalVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:util:$besuInternalVersion",withoutAbi
-    testImplementation "org.hyperledger.besu:bls12-381:$besuCryptoDepVersion",withoutAbi
+    testImplementation "org.hyperledger.besu:bls12-381:$besuBlsVersion",withoutAbi
     testImplementation "org.hyperledger.besu:secp256k1:$besuCryptoDepVersion",withoutAbi
 }