Upgraded to secure web3j dependency

OpenFuturePlatform · Aug 8, 2024 · 1e6f428 · 1e6f428
1 parent b914508
commit 1e6f428
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/open-api-ci-cd.yml b/.github/workflows/open-api-ci-cd.yml
@@ -51,10 +51,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Prepare Java SDK 11
+      - name: Prepare Java SDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -109,10 +109,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Prepare Java SDK 11
+      - name: Prepare Java SDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Build project
         run: ./gradlew assemble

diff --git a/build.gradle b/build.gradle
@@ -14,13 +14,14 @@ apply plugin: 'io.spring.dependency-management'
 
 group = 'io.openfuture.api'
 sourceCompatibility = 17
+targetCompatibility = 17
 
 repositories {
     mavenCentral()
 }
 
 ext {
-    s3Version = "1.11.333"
+    s3Version = "1.12.261"
 }
 
 dependencies {
@@ -42,7 +43,6 @@ dependencies {
 
     // Ethereum
     implementation("org.web3j:web3j-spring-boot-starter:1.6.0")
-    //implementation('org.web3j:core:4.5.0')
     implementation('org.web3j:core:4.12.0'){
         exclude group : 'org.bouncycastle', module : 'bcprov-jdk18on'
         exclude group : 'com.squareup.okhttp3', module : 'okhttp'
@@ -68,11 +68,20 @@ dependencies {
     implementation('commons-io:commons-io:2.8.0')
     implementation 'org.apache.commons:commons-lang3:3.6'
 
-    implementation('org.apache.httpcomponents:httpclient:4.5.12')
+    implementation('org.apache.httpcomponents:httpclient:4.5.13')
 
     // Test
     testImplementation('org.springframework.boot:spring-boot-starter-test')
     testImplementation("org.mockito:mockito-core:2.22.0")
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
+    testImplementation("junit:junit:4.13.1")
+
+}
+
+test {
+    useJUnitPlatform()
 }
 
 sourceSets {
@@ -119,7 +128,7 @@ jacocoTestReport {
 check.dependsOn jacocoTestReport
 
 // Front
-processResources.dependsOn(':frontend:assemble')
-processResources.dependsOn(':widget:assemble')
-processResources.dependsOn(':tracker:assemble')
-processResources.dependsOn(':payment-chooser:assemble')
+//processResources.dependsOn(':frontend:assemble')
+//processResources.dependsOn(':widget:assemble')
+//processResources.dependsOn(':tracker:assemble')
+//processResources.dependsOn(':payment-chooser:assemble')
diff --git a/src/test/kotlin/io/openfuture/api/component/scaffold/V1ScaffoldCompilerTests.kt b/src/test/kotlin/io/openfuture/api/component/scaffold/V1ScaffoldCompilerTests.kt
@@ -15,6 +15,8 @@ import org.junit.Test
 import org.mockito.BDDMockito.given
 import org.mockito.Mock
 import java.nio.charset.Charset
+import java.util.*
+import kotlin.collections.HashMap
 
 internal class V1ScaffoldCompilerTests : UnitTest() {
 
@@ -225,7 +227,7 @@ internal class V1ScaffoldCompilerTests : UnitTest() {
 
     private fun createScaffoldContent(): String {
         val resource = javaClass.classLoader
-                .getResource("templates/ethereum/scaffold_${ethereumScaffoldCompiler.getVersion().name.toLowerCase()}.ftl")
+                .getResource("templates/ethereum/scaffold_${ethereumScaffoldCompiler.getVersion().name.lowercase()}.ftl")
         return IOUtils.toString(resource, Charset.defaultCharset())
     }