This is an automated email from the ASF dual-hosted git repository. arnold pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 8176b6ec812eaa1ca98a0a83927442f31272d315 Author: Arnold Galovics <[email protected]> AuthorDate: Mon Jun 5 12:04:35 2023 +0200 FINERACT-1724: Tomcat adjustments for the cargo test running --- integration-tests/build.gradle | 3 ++- integration-tests/dependencies.gradle | 2 +- oauth2-tests/build.gradle | 3 ++- oauth2-tests/dependencies.gradle | 2 +- twofactor-tests/build.gradle | 3 ++- twofactor-tests/dependencies.gradle | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index 7e511e8a2..e7e42b2ff 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -41,7 +41,7 @@ dependencies { } cargo { - containerId "tomcat9x" + containerId "tomcat10x" // looks like Cargo doesn't detect the WAR file automatically in the multi-module setup deployable { @@ -79,6 +79,7 @@ cargo { property 'cargo.start.jvmargs', jvmArgs property 'cargo.tomcat.connector.keystoreFile', file("$rootDir/fineract-provider/src/main/resources/keystore.jks") property 'cargo.tomcat.connector.keystorePass', 'openmf' + property 'cargo.tomcat.connector.keystoreType', 'JKS' property 'cargo.tomcat.httpSecure', true property 'cargo.tomcat.connector.sslProtocol', 'TLS' property 'cargo.tomcat.connector.clientAuth', false diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index d4b6f4db3..a2cdcad25 100644 --- a/integration-tests/dependencies.gradle +++ b/integration-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.69@zip' + tomcat 'org.apache.tomcat:tomcat:10.1.9@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-core', configuration: 'runtimeElements'), project(path: ':fineract-investor', configuration: 'runtimeElements'), diff --git a/oauth2-tests/build.gradle b/oauth2-tests/build.gradle index 4d1ab9750..1d3712151 100644 --- a/oauth2-tests/build.gradle +++ b/oauth2-tests/build.gradle @@ -41,7 +41,7 @@ dependencies { } cargo { - containerId "tomcat9x" + containerId "tomcat10x" // looks like Cargo doesn't detect the WAR file automatically in the multi-module setup deployable { @@ -76,6 +76,7 @@ cargo { property 'cargo.start.jvmargs', jvmArgs property 'cargo.tomcat.connector.keystoreFile', file("$rootDir/fineract-provider/src/main/resources/keystore.jks") property 'cargo.tomcat.connector.keystorePass', 'openmf' + property 'cargo.tomcat.connector.keystoreType', 'JKS' property 'cargo.tomcat.httpSecure', true property 'cargo.tomcat.connector.sslProtocol', 'TLS' property 'cargo.tomcat.connector.clientAuth', false diff --git a/oauth2-tests/dependencies.gradle b/oauth2-tests/dependencies.gradle index b886631c3..ce4f968e6 100644 --- a/oauth2-tests/dependencies.gradle +++ b/oauth2-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.69@zip' + tomcat 'org.apache.tomcat:tomcat:10.1.9@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api', diff --git a/twofactor-tests/build.gradle b/twofactor-tests/build.gradle index e518bb018..342505dc5 100644 --- a/twofactor-tests/build.gradle +++ b/twofactor-tests/build.gradle @@ -41,7 +41,7 @@ dependencies { } cargo { - containerId "tomcat9x" + containerId "tomcat10x" // looks like Cargo doesn't detect the WAR file automatically in the multi-module setup deployable { @@ -76,6 +76,7 @@ cargo { property 'cargo.start.jvmargs', jvmArgs property 'cargo.tomcat.connector.keystoreFile', file("$rootDir/fineract-provider/src/main/resources/keystore.jks") property 'cargo.tomcat.connector.keystorePass', 'openmf' + property 'cargo.tomcat.connector.keystoreType', 'JKS' property 'cargo.tomcat.httpSecure', true property 'cargo.tomcat.connector.sslProtocol', 'TLS' property 'cargo.tomcat.connector.clientAuth', false diff --git a/twofactor-tests/dependencies.gradle b/twofactor-tests/dependencies.gradle index b51fcbe13..f41cfb228 100644 --- a/twofactor-tests/dependencies.gradle +++ b/twofactor-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.69@zip' + tomcat 'org.apache.tomcat:tomcat:10.1.9@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api',
