From 958fa657cd81de1382af8ec4929bc0a791e7368d Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Mon, 6 Sep 2021 21:23:57 +0200
Subject: [PATCH 1/4] Configure Actions for Java 16

---
 .github/workflows/pr-pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-pipeline.yml b/.github/workflows/pr-pipeline.yml
index aec43abdf0..cda68c6532 100644
--- a/.github/workflows/pr-pipeline.yml
+++ b/.github/workflows/pr-pipeline.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 8
+    - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '16'
+        distribution: 'temurin'
     - name: Build with Maven (compile -> test -> package)
       run: mvn -B package --file pom.xml

From 2b52ab90c3ad53892e91edffe5b45dc3ebdf141e Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Mon, 6 Sep 2021 21:42:58 +0200
Subject: [PATCH 2/4] Fix launch file

---
 README.md  | 2 +-
 launch.bat | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bfd2b8a7c1..d581445d93 100644
--- a/README.md
+++ b/README.md
@@ -189,7 +189,7 @@ To launch the server, you may either:
    * If you already have Maven installed, simply run the command "mvn clean install" to create the jar file.
    * IntelliJ also comes with built-in Maven support. Open a new terminal window inside IntelliJ, type "mvn clean install" (your command should now be marked green), then Ctrl+Enter to build the jar file.
 2. Launch the jar file
-   * Double click on "launch.bat"
+   * Double click on "launch.bat" (need to have Java 16 installed)
     
 #### Launch with Docker
 1. Start Docker
diff --git a/launch.bat b/launch.bat
index 299162ddb8..903ce475cf 100644
--- a/launch.bat
+++ b/launch.bat
@@ -1,5 +1,4 @@
 @echo off
 @title Cosmic
-set PATH="C:\Program Files\Java\jdk1.8.0_241\bin";%PATH%
-java -Xmx2048m -Dwzpath=wz\ -jar target\Cosmic.jar
+java -Xmx2048m -jar target\Cosmic.jar
 pause
\ No newline at end of file

From 2cfdd1da4fe6382dc6937a5fcbbd6aad5c65a45d Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Mon, 6 Sep 2021 21:59:36 +0200
Subject: [PATCH 3/4] Update dependencies

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

diff --git a/pom.xml b/pom.xml
index 0334d6b9c4..ae3f8cc4fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
         <log4j.version>2.14.1</log4j.version>
         <graalvm.version>21.1.0</graalvm.version>
-        <netty.version>4.1.65.Final</netty.version>
+        <netty.version>4.1.67.Final</netty.version>
         <junit.version>5.7.2</junit.version>
     </properties>
 
@@ -37,19 +37,19 @@
         <dependency> <!-- only used for some tools -->
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
 
         <!-- Database -->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.23</version>
+            <version>8.0.26</version>
         </dependency>
 
         <!-- Networking -->
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.32</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>default-jar</id>

From 82f2c84034245195cbe7bb3c1aa412877f8b969a Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Mon, 6 Sep 2021 22:11:27 +0200
Subject: [PATCH 4/4] Add surefire plugin for unit tests

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index ae3f8cc4fa..577282b1a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,11 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+
             <!-- Enable assembling jar that includes all dependencies -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>