Update spigot-api and ormlite-jdbc

This might fix the Xerial driver warning from #9/BUKKIT-1073
ChestShop-authors · Apr 18, 2018 · 34b6ab2 · 34b6ab2 · Phoenix616 · Apr 18, 2018
1 parent 88bffc6
commit 34b6ab2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.j256.ormlite</groupId>
             <artifactId>ormlite-jdbc</artifactId>
-            <version>4.48</version>
+            <version>5.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -101,7 +101,8 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit-lite</artifactId>
-            <version>1.1</version>
+            <version>1.2</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -125,7 +126,7 @@
             <groupId>info.somethingodd</groupId>
             <artifactId>odditem</artifactId>
             <version>0.9.5</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -249,6 +250,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>com.bekvon.bukkit</groupId>
             <artifactId>residence</artifactId>

diff --git a/src/main/java/com/Acrobot/ChestShop/ChestShop.java b/src/main/java/com/Acrobot/ChestShop/ChestShop.java
@@ -356,7 +356,7 @@ private void startStatistics() {
         } catch (IOException ex) {
             ChestShop.getBukkitLogger().severe("There was an error while submitting MCStats statistics.");
         }
-        new org.bstats.MetricsLite(this);
+        new org.bstats.bukkit.MetricsLite(this);
     }
 
     private static final int PROJECT_BUKKITDEV_ID = 31263;

diff --git a/src/main/java/com/Acrobot/ChestShop/Database/Migrations.java b/src/main/java/com/Acrobot/ChestShop/Database/Migrations.java
@@ -5,6 +5,7 @@
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.GenericRawResults;
 
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.UUID;
@@ -104,7 +105,11 @@ private static boolean migrateTo3() {
                         lastInfo = System.currentTimeMillis();
                     }
                 }
-                results.close();
+                try {
+                    results.close();
+                } catch (IOException e1) {
+                    ChestShop.getBukkitLogger().log(Level.WARNING, "Error while closing results! " + e.getMessage());
+                }
                 ChestShop.getBukkitLogger().log(Level.INFO, success + " accounts successfully migrated. " + error + " accounts failed to migrate!");
             }
             ChestShop.getBukkitLogger().log(Level.INFO, "Migration of accounts table finished in " + (System.currentTimeMillis() - start) / 1000.0 + "s!");