upgrade besu and java

Signed-off-by: gtebrean <[email protected]>

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

@@ -25,11 +25,11 @@ jobs:
           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:

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'

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
 }