upgrade java and besu

Signed-off-by: gtebrean <99179176+gtebrean@users.noreply.github.com>

Author: gtebrean

.github/workflows/build.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

.github/workflows/publish-snapshot.yml

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

.github/workflows/release.yml

@@ -17,18 +17,18 @@ jobs:
       - name: Build Workflow Dispatch
         uses: convictional/trigger-workflow-and-wait@v1.3.0
         with:
-          owner: hyperledger-web3j
+          owner: LFDT-web3j
           repo: web3j-unit
           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@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.13.1]() (Upcoming)
+# [4.14.0]() (Upcoming)
 
 ### Bug Fixes
 
@@ -15,7 +15,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-*
+* Upgrade to Besu 25.2.1 and Java 21  [#92](https://github.com/hyperledger-web3j/web3j-unit/pull/92)
+
 
 # [4.13.0](https://github.com/hyperledger-web3j/web3j-unit/releases/tag/v4.13.0) (2025-03-07)
 

build.gradle

@@ -18,10 +18,11 @@ ext {
     logbackVersion = '1.5.6'
     mockitoKotlinVersion = '1.9.24'
     testContainersVersion = '1.19.8'
-    besuPluginVersion = '24.1.2'
-    besuInternalVersion = '24.1.2'
+    besuPluginVersion = '25.2.1'
+    besuInternalVersion = '25.2.1'
     besuInternalCryptoVersion = '23.1.3'
-    besuCryptoDepVersion = '0.8.3'
+    besuCryptoDepVersion = '1.1.2'
+    besuBlsVersion = '1.0.0'
 }
 
 apply {
@@ -35,7 +36,7 @@ apply {
         'junit'
     ].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
@@ -80,7 +81,7 @@ dependencies {
     implementation "org.hyperledger.besu.internal:metrics-core:$besuInternalVersion"
     implementation "org.hyperledger.besu.internal:trie:$besuInternalVersion"
     implementation "org.hyperledger.besu.internal:util:$besuInternalVersion"
-    implementation "org.hyperledger.besu:bls12-381:$besuCryptoDepVersion"
+    implementation "org.hyperledger.besu:bls12-381:$besuBlsVersion"
 
     implementation "org.hyperledger.besu:secp256k1:$besuCryptoDepVersion"
 }
@@ -90,17 +91,14 @@ test {
 }
 
 compileKotlin {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
+    kotlinOptions.jvmTarget = "21"
 }
 
 compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
+    kotlinOptions.jvmTarget = "21"
 }
 
+
 tasks.named("spotlessKotlin").configure { dependsOn("compileKotlin","spotlessJava", "spotlessGroovyGradle","processTestResources") }
 tasks.named("spotlessJava").configure { dependsOn("compileTestJava","compileTestKotlin","compileKotlin","compileTestKotlin","spotlessGroovyGradle","processTestResources") }
 tasks.named("test").configure { dependsOn("spotlessKotlin","spotlessJava") }

gradle/java/build.gradle

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

gradle/publish/build.gradle

@@ -48,9 +48,9 @@ publishing {
                         slug = project.rootProjectOverride
                     }
 
-                    url = "https://github.com/hyperledger-web3j/$slug"
-                    connection = "scm:https://github.com/hyperledger-web3j/${slug}.git"
-                    developerConnection = "scm:git://github.com/hyperledger-web3j/${slug}.git"
+                    url = "https://github.com/LFDT-web3j/$slug"
+                    connection = "scm:https://github.com/LFDT-web3j/${slug}.git"
+                    developerConnection = "scm:git://github.com/LFDT-web3j/${slug}.git"
                 }
 
                 developers {

src/main/kotlin/org/web3j/container/ServiceBuilder.kt

@@ -19,7 +19,7 @@ import org.web3j.container.embedded.EmbeddedService
 import org.web3j.container.geth.GethContainer
 import org.web3j.evm.Configuration
 import org.web3j.evm.PassthroughTracer
-import java.net.URL
+import java.net.URI
 
 class ServiceBuilder {
 
@@ -71,7 +71,7 @@ class ServiceBuilder {
                 if (genesisPath == "dev") {
                     EmbeddedService(Configuration(Address(selfAddress), 10), PassthroughTracer())
                 } else {
-                    EmbeddedService(Configuration(Address(selfAddress), 10, URL(genesisPath)), PassthroughTracer())
+                    EmbeddedService(Configuration(Address(selfAddress), 10, URI(genesisPath).toURL()), PassthroughTracer())
                 }
             }
             NodeType.COMPOSE -> KDockerComposeContainer(dockerCompose, serviceName, servicePort)