CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

Fix transitive dependency issues introduced by Mock Server upgrade

Browse Source
This commit is contained in:
Aleksandar Vidakovic
2022-03-21 13:04:57 +01:00
committed by Aleksandar Vidakovic
parent 5232656a6e
commit 17f521604d
9 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-postgresql.yml
+1 -1
View File
@@ -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
.github/workflows/build.yml
+1 -1
View File
@@ -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
.github/workflows/sonarqube.yml
+1 -1
View File
@@ -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
build.gradle
+4 -4
View File
@@ -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'
fineract-provider/dependencies.gradle
+2
View File
@@ -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',
fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java
+2 -2
View File
@@ -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")
integration-tests/dependencies.gradle
+2 -2
View File
@@ -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',
oauth2-tests/dependencies.gradle
+2
View File
@@ -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',
twofactor-tests/dependencies.gradle
+2
View File
@@ -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',