update yml scripts

hyperledger-web3j · May 8, 2023 · 5186c3d · 5186c3d
1 parent 98b2762
commit 5186c3d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,10 +15,10 @@ jobs:
       registry.password: ${{ secrets.REGISTRY_PASSWORD }}
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -33,10 +33,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -17,10 +17,10 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,10 +24,10 @@ jobs:
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

diff --git a/codegen/build.gradle b/codegen/build.gradle
@@ -38,5 +38,5 @@ file("src/test/resources/solidity").listFiles().each { File file ->
     }
 }
 
-tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
+tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","processTestResources","javadoc") }
 tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }
diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle
@@ -82,10 +82,10 @@ nexusStaging {
 }
 
 
-//signing {
-//    sign publishing.publications.maven
-//    def signingKey = new File("$rootDir/web3j.asc")
-//    if (signingKey.exists()) {
-//        useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE'))
-//    }
-//}
+signing {
+    sign publishing.publications.maven
+    def signingKey = new File("$rootDir/web3j.asc")
+    if (signingKey.exists()) {
+        useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE'))
+    }
+}
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
@@ -9,8 +9,9 @@ repositories {
     maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
 }
 ext {
-    besuPluginVersion = '23.1.3'
-    besuInternalVersion = '23.4.0-RC1'
+    besuPluginVersion = '23.4.0'
+    besuInternalVersion = '23.4.0'
+    besuInternalCryptoVersion = '23.1.3'
     besuCryptoDepVersion = '0.7.1'
 }
 
@@ -34,7 +35,7 @@ dependencies {
     testImplementation "org.hyperledger.besu.internal:api:$besuInternalVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:config:$besuInternalVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:core:$besuInternalVersion",withoutAbi
-    testImplementation "org.hyperledger.besu.internal:crypto:$besuPluginVersion",withoutAbi
+    testImplementation "org.hyperledger.besu.internal:crypto:$besuInternalCryptoVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:rlp:$besuInternalVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:kvstore:$besuInternalVersion",withoutAbi
     testImplementation "org.hyperledger.besu.internal:metrics-core:$besuInternalVersion",withoutAbi