From 4f973dbeedec83b71acb5b7ce5022436daaacaa6 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sat, 21 Nov 2020 20:11:46 +0100
Subject: [PATCH] Resolve maven dependency conflicts

---
 client/pom.xml | 4 ----
 master/pom.xml | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index f51b964e..b82f968e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -81,10 +81,6 @@
 			<groupId>org.openjfx</groupId>
 			<artifactId>javafx-media</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
diff --git a/master/pom.xml b/master/pom.xml
index 8e74add4..f2d5af82 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -63,7 +63,7 @@
 			<dependency>
 				<groupId>com.squareup.moshi</groupId>
 				<artifactId>moshi</artifactId>
-				<version>1.5.0</version>
+				<version>1.6.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.json</groupId>
@@ -73,7 +73,7 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.25</version>
+				<version>1.7.30</version>
 			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>