diff --git a/pom.xml b/pom.xml index 3b5040d10..60be53522 100644 --- a/pom.xml +++ b/pom.xml @@ -135,12 +135,6 @@ spring-boot-devtools true - - org.hsqldb - hsqldb - 2.5.1 - runtime - diff --git a/src/main/resources/application-mysql.properties b/src/main/resources/application-mysql.properties index ccc6807c3..a2a4c4998 100644 --- a/src/main/resources/application-mysql.properties +++ b/src/main/resources/application-mysql.properties @@ -1,12 +1,11 @@ # database init, supports mysql too database=mysql -spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost/cheapy?serverTimezone=UTC} +#spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost/cheapy?serverTimezone=UTC} spring.datasource.username=${MYSQL_USER:cheapy} spring.datasource.password=${MYSQL_PASS:cheapy} # SQL is written to be idempotent so this is safe spring.datasource.initialization-mode=always -spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy spring.jpa.properties.javax.persistence.schema-generation.drop-source=metadata # Naming strategy spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c93d5eac7..03c2f5c98 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,6 +4,7 @@ database=mysql spring.datasource.data=classpath*:db/${database}/data.sql spring.h2.console.enabled=true spring.profiles.active=mysql +spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost/cheapy?serverTimezone=UTC} # Web spring.thymeleaf.mode=HTML