Merge branch 'master' into 1.4.0

# Conflicts:
#	src/main/resources/application.properties

pom.xml

@@ -103,6 +103,10 @@
                 spring-boot-starter-logging
             </artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>
                 org.springframework.boot
@@ -226,7 +230,7 @@
                     <source>21</source>
                     <target>21</target>
                 </configuration>
-             </plugin>
+            </plugin>
         </plugins>
     </build>
 

src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.datasource.driver-class-name=org.sqlite.JDBC
 spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect
 spring.datasource.url=jdbc:sqlite:db/quickdrop.db
 spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=none
 spring.thymeleaf.prefix=classpath:/templates/
 spring.thymeleaf.suffix=.html
 spring.thymeleaf.cache=false
@@ -14,4 +14,5 @@ server.error.path=/error
 #logging.level.org.springframework=DEBUG
 #logging.level.org.hibernate=DEBUG
 #logging.level.org.springframework.security=DEBUG
-app.version=1.4.0
+spring.flyway.baseline-on-migrate=true
+spring.flyway.baseline-version=1