From 377787280cc5a42e7b1461bba1a14b10e3e1a65d Mon Sep 17 00:00:00 2001 From: ibondarenko Date: Wed, 16 Oct 2019 09:43:28 +0300 Subject: [PATCH] FINERACT-724 fixes after review --- fineract-provider/dependencies.gradle | 11 +++++++---- fineract-provider/dev-dependencies.gradle | 2 +- .../fineract/integrationtests/common/Utils.java | 2 +- .../src/main/resources/application.properties | 3 --- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index da95a339d..a34798cc6 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -27,11 +27,14 @@ dependencies { providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:${springBootVersion}") + compile ("org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion") { + exclude group: 'com.zaxxer', module: 'HikariCP' + } + compile( // [group: 'ch.vorburger.mariaDB4j', name: 'mariaDB4j', version: '2.1.3'], [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion], - [group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: springBootVersion], [group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion], [group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion], @@ -104,7 +107,7 @@ dependencies { [group: 'com.mockrunner', name: 'mockrunner-jms', version: '1.0.6'], [group: 'com.mockrunner', name: 'mockrunner-jdbc', version: '1.0.6'] - testCompile ("org.springframework.boot:spring-boot-starter-test:$springBootVersion") { - exclude group: 'com.jayway.jsonpath', module: 'json-path' - } + testCompile ("org.springframework.boot:spring-boot-starter-test:$springBootVersion") { + exclude group: 'com.jayway.jsonpath', module: 'json-path' + } } diff --git a/fineract-provider/dev-dependencies.gradle b/fineract-provider/dev-dependencies.gradle index affbdd36a..ca10d28c0 100644 --- a/fineract-provider/dev-dependencies.gradle +++ b/fineract-provider/dev-dependencies.gradle @@ -38,7 +38,7 @@ dependencies { [group: 'org.springframework', name: 'spring-context-support', version: springVersion], [group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion], - [group: 'org.apache.openjpa', name:'openjpa-all', version:openJPAVersion], + [group: 'org.apache.openjpa', name:'openjpa', version:openJPAVersion], [group: 'org.apache.openjpa', name:'openjpa-maven-plugin', version:openJPAVersion], [group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'], [group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion], diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java index 5aff959fd..cf4ee6630 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java @@ -61,7 +61,7 @@ public class Utils { public static final String TENANT_TIME_ZONE = "Asia/Kolkata"; - private static final String HEALTH_URL = "/fineract-provider/actuator/health"; + private static final String HEALTH_URL = "/fineract-provider/actuator/health"; private static final String LOGIN_URL = "/fineract-provider/api/v1/authentication?username=mifos&password=password&" + TENANT_IDENTIFIER; public static void initializeRESTAssured() { diff --git a/fineract-provider/src/main/resources/application.properties b/fineract-provider/src/main/resources/application.properties index a54cc7db0..b1f6aea78 100644 --- a/fineract-provider/src/main/resources/application.properties +++ b/fineract-provider/src/main/resources/application.properties @@ -19,6 +19,3 @@ spring.profiles.default=basicauth management.health.jms.enabled=false -#security.enable-csrf=false -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.format_sql=true