aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-04-04 12:21:24 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2021-04-04 12:21:24 -0700
commit47e65469210e4bb0760a65e672f10ebcd7b1e5a0 (patch)
tree873f577e79a61930a78b617c40424bf55db8d3b4
parent98b0a79679d6195474ca4ff4995d72de80f2e225 (diff)
downloadtrackermap-server-47e65469210e4bb0760a65e672f10ebcd7b1e5a0.tar.gz
trackermap-server-47e65469210e4bb0760a65e672f10ebcd7b1e5a0.tar.bz2
trackermap-server-47e65469210e4bb0760a65e672f10ebcd7b1e5a0.zip
Upgrade Liquibase library
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/org/traccar/database/DataManager.java6
2 files changed, 4 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index fae53ed31..cd1a5e81e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,9 +64,7 @@ dependencies {
implementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion"
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr353:$jacksonVersion"
- implementation "org.liquibase:liquibase-core:3.10.3", { // needs upgrade
- exclude group: "ch.qos.logback", module: "logback-classic"
- }
+ implementation "org.liquibase:liquibase-core:4.3.2"
implementation "com.sun.mail:javax.mail:1.6.2"
implementation "org.jxls:jxls:2.4.7" // needs upgrade (wait for jexl 4)
implementation "org.jxls:jxls-poi:1.0.16" // needs upgrade (wait for jexl 4)
diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index a3b31350f..15137ad91 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 2021 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -272,11 +272,11 @@ public class DataManager {
return result;
}
- private void initDatabaseSchema() throws SQLException, LiquibaseException {
+ private void initDatabaseSchema() throws LiquibaseException {
if (config.hasKey(Keys.DATABASE_CHANGELOG)) {
- ResourceAccessor resourceAccessor = new FileSystemResourceAccessor();
+ ResourceAccessor resourceAccessor = new FileSystemResourceAccessor(new File("."));
Database database = DatabaseFactory.getInstance().openDatabase(
config.getString(Keys.DATABASE_URL),