From 320766a0b106271619134d0d0908843aae869dd7 Mon Sep 17 00:00:00 2001
From: Charles Gould <charles@gould.dev>
Date: Sat, 1 Jan 2022 17:18:02 -0600
Subject: [PATCH] Bump to Java 17, Spring 2.6

---
 .build.yml        |  6 ++----
 README.md         |  2 +-
 client/pom.xml    | 15 +++------------
 pom.xml           |  4 ++--
 server/pom.xml    |  5 +++--
 system.properties |  2 +-
 6 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.build.yml b/.build.yml
index 4e05ad6..156ffe3 100644
--- a/.build.yml
+++ b/.build.yml
@@ -1,9 +1,7 @@
-image: ubuntu/focal
+image: ubuntu/21.10
 packages:
-  - adoptopenjdk-11-hotspot-jre
+  - openjdk-17-jdk
   - maven
-repositories:
-  adoptopenjdk: https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ focal main 8AC3B29174885C03
 sources:
   - https://git.sr.ht/~crg/lingo
 artifacts:
diff --git a/README.md b/README.md
index e402324..7a54b58 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ A word guessing game based on the [game show](https://en.wikipedia.org/wiki/Ling
 
 #### JavaFX client
 
-- Requirements: Java 11, Maven 3
+- Requirements: Java 17, Maven 3
 - Build: `mvn clean install`
 - Start client: `mvn -f client javafx:run`
 
diff --git a/client/pom.xml b/client/pom.xml
index 28b7668..fe30900 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -12,7 +12,7 @@
 	<name>Lingo :: Client</name>
 
 	<properties>
-		<javafx.version>15.0.1</javafx.version>
+		<javafx.version>17.0.1</javafx.version>
 		<lingo.url>https://lingo.gould.dev</lingo.url>
 	</properties>
 
@@ -52,23 +52,14 @@
 			<plugin>
 				<groupId>org.openjfx</groupId>
 				<artifactId>javafx-maven-plugin</artifactId>
-				<version>0.0.5</version>
+				<version>0.0.8</version>
 				<configuration>
-					<mainClass>dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
+					<mainClass>dev.gould.lingo.client/dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
 					<options>
 						<option>-Dlingo.url=${lingo.url}</option>
 					</options>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<mainClass>dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
-					<addResourcesToClasspath>true</addResourcesToClasspath>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pom.xml b/pom.xml
index fa20b79..ef84380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.4</version>
+		<version>2.6.2</version>
 	</parent>
 
 	<groupId>dev.gould</groupId>
@@ -17,7 +17,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 
 	<modules>
diff --git a/server/pom.xml b/server/pom.xml
index 0b6bd90..a41a8f9 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -45,17 +45,18 @@
 			<plugin>
 				<groupId>com.google.cloud.tools</groupId>
 				<artifactId>jib-maven-plugin</artifactId>
-				<version>2.8.0</version>
+				<version>3.1.4</version>
 				<configuration>
 					<!-- Enable this setting to allow pushes to local Docker registry -->
 					<!--<allowInsecureRegistries>true</allowInsecureRegistries>-->
 					<from>
-						<image>adoptopenjdk:11-jre-hotspot</image>
+						<image>eclipse-temurin:17-jre</image>
 					</from>
 					<to>
 						<image>docker.io/charego/lingo</image>
 					</to>
 					<container>
+						<mainClass>dev.gould.lingo.server.LingoServer</mainClass>
 						<ports>
 							<port>8080</port>
 						</ports>
diff --git a/system.properties b/system.properties
index 9146af5..eafd676 100644
--- a/system.properties
+++ b/system.properties
@@ -1 +1 @@
-java.runtime.version=11
+java.runtime.version=17