From 873a4599bcf68672e2952d56ba06f085cfea4fb8 Mon Sep 17 00:00:00 2001
From: Paul Vogel <evilcodes.dev@gmail.com>
Date: Tue, 4 Dec 2018 08:19:15 +0100
Subject: [PATCH 1/2] Readd spongeapi (revert from merge)

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c11d024..34f6ff4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,9 +143,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version> 1.13.2-R0.1-SNAPSHOT</version>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>spongeapi</artifactId>
+            <version>7.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

From e899080f332cb43e3f6c741ea819fb680d00f225 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Thu, 3 Jan 2019 04:38:58 +0000
Subject: [PATCH 2/2] Bump HikariCP from 3.2.0 to 3.3.0

Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/brettwooldridge/HikariCP/releases)
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.2.0...HikariCP-3.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34f6ff4b..0c31b52d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.2.0</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>