Fix transitive dependency issues introduced by Mock Server upgrade
This commit is contained in:
committed by
Aleksandar Vidakovic
parent
5232656a6e
commit
17f521604d
@@ -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',
|
||||
|
||||
+2
-2
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user