diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml index 73a74155a..0366f8268 100644 --- a/.github/workflows/build-postgresql.yml +++ b/.github/workflows/build-postgresql.yml @@ -27,7 +27,7 @@ jobs: TZ: Asia/Kolkata steps: - name: Set up cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 236163f8c..0fa6bbe55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: TZ: Asia/Kolkata steps: - name: Set up cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index b4fafc52e..af4fde7f1 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -11,7 +11,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} steps: - name: Set up cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches diff --git a/build.gradle b/build.gradle index b5e9fb2b5..fbbeb6c68 100644 --- a/build.gradle +++ b/build.gradle @@ -133,7 +133,7 @@ allprojects { dependency 'com.github.librepdf:openpdf:1.3.27' dependency 'org.mnode.ical4j:ical4j:3.2.1' dependency 'org.quartz-scheduler:quartz:2.3.2' - dependency 'com.amazonaws:aws-java-sdk-s3:1.12.180' + dependency 'com.amazonaws:aws-java-sdk-s3:1.12.181' dependency 'org.ehcache:ehcache:3.10.0' dependency 'com.github.spullara.mustache.java:compiler:0.9.10' dependency 'com.jayway.jsonpath:json-path:2.7.0' @@ -155,7 +155,7 @@ allprojects { dependency 'org.webjars.npm:swagger-ui-dist:4.6.2' dependency 'org.webjars:webjars-locator-core:0.50' dependency 'com.icegreen:greenmail-junit5:1.6.7' - dependency 'com.intuit.karate:karate-junit5:1.2.0.RC4' + dependency 'com.intuit.karate:karate-junit5:1.2.0.RC5' // fineract client dependencies dependency "com.squareup.retrofit2:retrofit:$retrofitVersion" @@ -188,8 +188,8 @@ allprojects { dependency "javax.annotation:javax.annotation-api:1.3.2" dependency "com.google.code.findbugs:jsr305:3.0.2" dependency "commons-codec:commons-codec:1.15" - dependency "org.bouncycastle:bcpkix-jdk15on:1.70" - dependency "org.bouncycastle:bcprov-jdk15on:1.70" + dependency "org.bouncycastle:bcpkix-jdk15to18:1.70" + dependency "org.bouncycastle:bcprov-jdk15to18:1.70" dependency ('org.liquibase:liquibase-core:4.9.0') { exclude 'javax.xml.bind:jaxb-api' diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 7a4e704e1..348f63d14 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -128,6 +128,8 @@ dependencies { testImplementation( 'org.mockito:mockito-core', 'org.mockito:mockito-junit-jupiter', 'org.junit.platform:junit-platform-runner', // required to be able to run tests directly under Eclipse, see FINERACT-943 & FINERACT-1021 + 'org.bouncycastle:bcpkix-jdk15to18', + 'org.bouncycastle:bcprov-jdk15to18', 'io.cucumber:cucumber-core', 'io.cucumber:cucumber-java', 'io.cucumber:cucumber-java8', diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java index ea305b252..cdc2ca423 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java @@ -95,8 +95,8 @@ public class ClasspathDuplicatesStepDefinitions implements En { || resourcePath.equals("WEB-INF/web.xml") || resourcePath.equals("META-INF/web-fragment.xml") || resourcePath.equals("META-INF/eclipse.inf") || resourcePath.equals("META-INF/ECLIPSE_.SF") || resourcePath.equals("META-INF/ECLIPSE_.RSA") || resourcePath.equals("META-INF/BC2048KE.DSA") - || resourcePath.equals("META-INF/BC2048KE.SF") || resourcePath.equals("META-INF/BC1024KE.SF") - || resourcePath.equals("OSGI-INF/bundle.info") + || resourcePath.equals("META-INF/BC1024KE.DSA") || resourcePath.equals("META-INF/BC2048KE.SF") + || resourcePath.equals("META-INF/BC1024KE.SF") || resourcePath.equals("OSGI-INF/bundle.info") // Spring Framework knows what they are do.. || resourcePath.startsWith("META-INF/spring") || resourcePath.startsWith("META-INF/additional-spring") || resourcePath.startsWith("META-INF/terracotta") diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index 5f82cd06f..019ec232b 100644 --- a/integration-tests/dependencies.gradle +++ b/integration-tests/dependencies.gradle @@ -28,8 +28,8 @@ dependencies { 'com.google.truth:truth', 'com.google.truth.extensions:truth-java8-extension', 'org.awaitility:awaitility', - 'org.bouncycastle:bcpkix-jdk15on', - 'org.bouncycastle:bcprov-jdk15on', + 'org.bouncycastle:bcpkix-jdk15to18', + 'org.bouncycastle:bcprov-jdk15to18', 'io.cucumber:cucumber-core', 'io.cucumber:cucumber-java', 'io.cucumber:cucumber-java8', diff --git a/oauth2-tests/dependencies.gradle b/oauth2-tests/dependencies.gradle index 5524d110a..e8088f6e3 100644 --- a/oauth2-tests/dependencies.gradle +++ b/oauth2-tests/dependencies.gradle @@ -24,6 +24,8 @@ dependencies { testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api', + 'org.bouncycastle:bcpkix-jdk15to18', + 'org.bouncycastle:bcprov-jdk15to18', 'io.cucumber:cucumber-core', 'io.cucumber:cucumber-java', 'io.cucumber:cucumber-java8', diff --git a/twofactor-tests/dependencies.gradle b/twofactor-tests/dependencies.gradle index d1347347c..190bfff9c 100644 --- a/twofactor-tests/dependencies.gradle +++ b/twofactor-tests/dependencies.gradle @@ -24,6 +24,8 @@ dependencies { testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api', + 'org.bouncycastle:bcpkix-jdk15to18', + 'org.bouncycastle:bcprov-jdk15to18', 'io.cucumber:cucumber-core', 'io.cucumber:cucumber-java', 'io.cucumber:cucumber-java8',