You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ju...@apache.org on 2019/10/16 20:03:41 UTC
[fineract-cn-template] 28/45: Migrate template service from MariaDB
to PostgreSQL
This is an automated email from the ASF dual-hosted git repository.
juhan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git
commit 4e85c4e699261f09aee37440f020ba7d024f7a5f
Author: Isaac Kamga <u2...@gmail.com>
AuthorDate: Tue Mar 19 06:00:58 2019 +0100
Migrate template service from MariaDB to PostgreSQL
---
NOTICE.txt | 2 +-
service/build.gradle | 2 +-
.../fineract/cn/template/service/TemplateConfiguration.java | 4 ++--
.../service/internal/command/handler/MigrationAggregate.java | 2 +-
service/src/main/resources/application.yml | 10 +++++-----
.../migrations/{mariadb => postgresql}/V1__initial_setup.sql | 0
shared.gradle | 5 +++--
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 103e2dc..9632ed9 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Fineract CN Template
-Copyright [2017-2018] The Apache Software Foundation
+Copyright [2017-2019] The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/service/build.gradle b/service/build.gradle
index 23acde2..7dd4a75 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -54,7 +54,7 @@ dependencies {
[group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
[group: 'org.apache.fineract.cn', name: 'async', version: versions.frameworkasync],
[group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra],
- [group: 'org.apache.fineract.cn', name: 'mariadb', version: versions.frameworkmariadb],
+ [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql],
[group: 'org.apache.fineract.cn', name: 'command', version: versions.frameworkcommand],
[group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator]
)
diff --git a/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java b/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java
index 568ae47..0f1a8b2 100644
--- a/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java
@@ -24,7 +24,7 @@ import org.apache.fineract.cn.cassandra.config.EnableCassandra;
import org.apache.fineract.cn.command.config.EnableCommandProcessing;
import org.apache.fineract.cn.lang.config.EnableServiceException;
import org.apache.fineract.cn.lang.config.EnableTenantContext;
-import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
+import org.apache.fineract.cn.postgresql.config.EnablePostgreSQL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -43,7 +43,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
@EnableAsync
@EnableTenantContext
@EnableCassandra
-@EnableMariaDB
+@EnablePostgreSQL
@EnableCommandProcessing
@EnableAnubis
@EnableServiceException
diff --git a/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java
index ef44e6c..a5d9876 100644
--- a/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java
+++ b/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java
@@ -27,7 +27,7 @@ import org.apache.fineract.cn.command.annotation.CommandHandler;
import org.apache.fineract.cn.command.annotation.CommandLogLevel;
import org.apache.fineract.cn.command.annotation.EventEmitter;
import org.apache.fineract.cn.lang.ApplicationName;
-import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean;
+import org.apache.fineract.cn.postgresql.domain.FlywayFactoryBean;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 3d8ab85..2ae6bd0 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -42,13 +42,13 @@ cassandra:
write: LOCAL_QUORUM
delete: LOCAL_QUORUM
-mariadb:
- driverClass: org.mariadb.jdbc.Driver
+postgresql:
+ driverClass: org.postgresql.Driver
database: seshat
host: localhost
- port: 3306
- user: root
- password: mysql
+ port: 5432
+ user: postgres
+ password: postgres
bonecp:
idleMaxAgeInMinutes: 240
diff --git a/service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql b/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql
similarity index 100%
rename from service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql
rename to service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql
diff --git a/shared.gradle b/shared.gradle
index 31ee3aa..cb075a0 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -23,7 +23,7 @@ ext.versions = [
frameworklang : '0.1.0-BUILD-SNAPSHOT',
frameworkasync : '0.1.0-BUILD-SNAPSHOT',
frameworkcassandra : '0.1.0-BUILD-SNAPSHOT',
- frameworkmariadb : '0.1.0-BUILD-SNAPSHOT',
+ frameworkpostgresql : '0.1.0-BUILD-SNAPSHOT',
frameworkcommand : '0.1.0-BUILD-SNAPSHOT',
frameworktest: '0.1.0-BUILD-SNAPSHOT',
frameworkanubis: '0.1.0-BUILD-SNAPSHOT',
@@ -60,7 +60,8 @@ ext['spring-data-releasetrain.version'] = 'Gosling-SR2A'
dependencies {
compile(
- [group: 'com.google.code.findbugs', name: 'jsr305']
+ [group: 'com.google.code.findbugs', name: 'jsr305'],
+ [group: 'org.apache.fineract.cn', name: 'postgresql', version: '0.1.0-BUILD-SNAPSHOT']
)
testCompile(