Bump version to 1.15.1, update dependencies

This commit is contained in:
Brokkonaut
2019-12-20 05:27:24 +01:00
parent 31428d60e4
commit 793df218e5
2 changed files with 8 additions and 14 deletions

18
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId>
<version>1.14.1-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>LogBlock</name>
@ -42,24 +42,14 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.14.1-R0.1-SNAPSHOT</version>
<version>1.15.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
</exclusion>
<exclusion>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@ -70,7 +60,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
<version>3.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -737,6 +737,10 @@ class Updater {
config.set("version", "1.14.1");
}
if (configVersion.compareTo(new ComparableVersion("1.15.1")) < 0) {
config.set("version", "1.15.1");
}
// this can always be checked
try {
final Connection conn = logblock.getConnection();