Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 39 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<description>A shared database plugin for Overcast Community</description>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.bukkit.main>tc.oc.occ.database.Database</project.bukkit.main>
<project.author>applenick</project.author>
Expand Down Expand Up @@ -40,11 +39,11 @@
</repositories>

<dependencies>
<!-- SportPaper 1.8 -->
<!-- Intersected SportPaper 1.8-Paper 1.21.10 jar -->
<dependency>
<groupId>app.ashcon</groupId>
<artifactId>sportpaper</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<groupId>dev.pgm.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.8_1.21.10-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand All @@ -71,6 +70,20 @@
<scope>compile</scope>
</dependency>

<!-- Annotations -->
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>1.0.0</version>
</dependency>

<!-- BungeeCord api, same as in Paper 1.21 -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.21-R0.2</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -86,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.1</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg> <!-- Required for aikar/commands
Expand Down Expand Up @@ -138,21 +151,25 @@

<!-- Validates that code is properly formatted with Google's code
style -->
<plugin>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.27</version>
<configuration>
<style>google</style>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.27</version>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format</artifactId>
<version>1.27.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tc/oc/occ/database/ConnectionPool.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
import java.util.concurrent.CompletableFuture;
import javax.annotation.Nullable;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.jspecify.annotations.Nullable;

public class ConnectionPool {

Expand Down