From ef70dac1a049ce8ba2d5fe7d9f74f5b928021522 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Sat, 12 Feb 2022 17:22:54 +0100
Subject: [PATCH] Bump to Java 17

---
 .github/workflows/pr-pipeline.yml | 4 ++--
 Dockerfile                        | 4 ++--
 pom.xml                           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr-pipeline.yml b/.github/workflows/pr-pipeline.yml
index cda68c6532..a44c2607ac 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 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
+        java-version: '17'
         distribution: 'temurin'
     - name: Build with Maven (compile -> test -> package)
       run: mvn -B package --file pom.xml
diff --git a/Dockerfile b/Dockerfile
index c286375f60..d65c5576e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Cosmic JAR creation stage
 #
-FROM maven:3.8.1-openjdk-16 AS jar
+FROM maven:3.8.4-openjdk-17 AS jar
 
 # Build in a separated location which won't have permissions issues.
 WORKDIR /opt/cosmic
@@ -21,7 +21,7 @@ RUN mvn -f ./pom.xml clean package -Dmaven.test.skip -T 1C
 #
 # Server creation stage
 #
-FROM openjdk:16
+FROM openjdk:17.0.2
 
 # Host the server in a location that won't have permissions issues.
 WORKDIR /opt/server
diff --git a/pom.xml b/pom.xml
index 0857beffb6..da40305258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>16</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <mainClass>net.server.Server</mainClass>