From 8fb2a1595c6f7960972a8f73b51ee9b1573683c6 Mon Sep 17 00:00:00 2001
From: ProgrammerDan <programmerdan@gmail.com>
Date: Thu, 8 Jun 2017 15:09:44 -0400
Subject: [PATCH] Update to spigot 1.12

---
 .editorconfig                                 | 25 +++++++++++++++++++
 CONTRIBUTING.md                               |  1 -
 pom.xml                                       |  8 +++---
 .../mc/civchat2/database/Database.java        |  4 +--
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 .editorconfig
 delete mode 100644 CONTRIBUTING.md

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..9887763
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,25 @@
+# Editorconfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+continuation_indent_size = 8
+
+[*.java]
+indent_style = tab
+indent_size = 4
+
+[*.xml]
+indent_style = tab
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index f00f114..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1 +0,0 @@
-To get started, <a href="https://www.clahub.com/agreements/CivcraftBot/CivChat2">sign the Contributor License Agreement</a>.
diff --git a/pom.xml b/pom.xml
index b501a53..5166ea8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>vg.civcraft.mc.civchat2</groupId>
 	<artifactId>CivChat2</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 	<name>CivChat2</name>
 	<url>https://github.com/DevotedMC/CivChat2</url>
 
@@ -35,19 +35,19 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.10.2-R0.1-SNAPSHOT</version>
+			<version>1.12-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>vg.civcraft.mc.namelayer</groupId>
 			<artifactId>NameLayer</artifactId>
-			<version>2.9.08</version>
+			<version>2.11.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>vg.civcraft.mc.civmodcore</groupId>
 			<artifactId>CivModCore</artifactId>
-			<version>1.5.09</version>
+			<version>1.6.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/vg/civcraft/mc/civchat2/database/Database.java b/src/vg/civcraft/mc/civchat2/database/Database.java
index e726658..6916b26 100644
--- a/src/vg/civcraft/mc/civchat2/database/Database.java
+++ b/src/vg/civcraft/mc/civchat2/database/Database.java
@@ -7,8 +7,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.avaje.ebeaninternal.server.lib.sql.DataSourceException;
-
 public class Database {
 
 	private String host;
@@ -66,7 +64,7 @@ public boolean connect() {
 		try {
 			Class.forName("com.mysql.jdbc.Driver").newInstance();
 		} catch (Exception ex) {
-			throw new DataSourceException("Failed to initialize JDBC driver.");
+			throw new RuntimeException("Failed to initialize JDBC driver.");
 		}
 		try {
 			connection = DriverManager.getConnection(jdbc);