Skip to content

Commit

Permalink
Update to spigot 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
ProgrammerDan committed Jun 8, 2017
1 parent 7bc322d commit 8fb2a15
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 8 deletions.
25 changes: 25 additions & 0 deletions .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
1 change: 0 additions & 1 deletion CONTRIBUTING.md

This file was deleted.

8 changes: 4 additions & 4 deletions pom.xml
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions src/vg/civcraft/mc/civchat2/database/Database.java
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 8fb2a15

Please sign in to comment.