hft-informatik/ubiquitous-computing-geo-timetracking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '45-switch-jpa-to-backed-by-postgres' into 'master'

Browse Source 
Resolve "Switch JPA to backed by Postgres"

Closes #45

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!22
This commit is contained in:
Marcel Schwarz 2020-04-26 13:55:05 +00:00
commit 4da629ce2d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/build.gradle
View File

@ -18,7 +18,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.mariadb.jdbc:mariadb-java-client:1.5.7' implementation 'org.mariadb.jdbc:mariadb-java-client'
runtimeOnly 'com.h2database:h2' runtimeOnly 'com.h2database:h2'
testImplementation('org.springframework.boot:spring-boot-starter-test') { testImplementation('org.springframework.boot:spring-boot-starter-test') {

1
backend/src/main/resources/application.properties
View File

@ -1,4 +1,5 @@
server.port=80 server.port=80
spring.data.rest.basePath=/api spring.data.rest.basePath=/api
spring.datasource.hikari.initialization-fail-timeout=0 spring.datasource.hikari.initialization-fail-timeout=0
spring.datasource.hikari.max-lifetime=300000
spring.profiles.active=prod spring.profiles.active=prod