From 745baf798f211ccb9256506e135ee60f0f59377a Mon Sep 17 00:00:00 2001
From: Charles Gould <charles@gould.dev>
Date: Sun, 11 Oct 2020 00:36:56 -0400
Subject: [PATCH] Bump versions

---
 .build.yml                                    |  2 +-
 Procfile                                      |  2 +-
 README.md                                     |  4 ++--
 client/pom.xml                                |  5 +++--
 pom.xml                                       |  2 +-
 server/pom.xml                                | 21 +++++++------------
 server/src/main/resources/static/index.html   |  4 ++--
 .../src/main/resources/static/practice.html   |  2 +-
 8 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.build.yml b/.build.yml
index 6592b0c..1300cce 100644
--- a/.build.yml
+++ b/.build.yml
@@ -5,7 +5,7 @@ packages:
 sources:
   - https://git.sr.ht/~crg/lingo
 artifacts:
-  - lingo/server/target/lingo-server.jar
+  - lingo/server/target/lingo.jar
 tasks:
   - build: |
       cd lingo
diff --git a/Procfile b/Procfile
index ea6bffa..8bbb149 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: java -jar server/target/lingo-server.jar
+web: java -jar server/target/lingo.jar
diff --git a/README.md b/README.md
index 7f74c9f..0023a06 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@ A word guessing game based on the [game show](https://en.wikipedia.org/wiki/Ling
 
 - Build: `mvn clean install`
 - Start server
-  * Default port (8080): `java -jar server/target/lingo-server.jar`
-  * Custom port: `java -jar server/target/lingo-server.jar --server.port=<port>`
+  * Default port (8080): `java -jar server/target/lingo.jar`
+  * Custom port: `java -jar server/target/lingo.jar --server.port=<port>`
 - Start client
   * Browser: `open http://localhost:<port>`
   * JavaFX: `mvn -f client javafx:run -Dlingo-url=http://localhost:<port>`
diff --git a/client/pom.xml b/client/pom.xml
index 6fd0e97..0c5cee7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -12,7 +12,7 @@
 	<name>Lingo :: Client</name>
 
 	<properties>
-		<javafx.version>11.0.2</javafx.version>
+		<javafx.version>15.0.1</javafx.version>
 		<lingo.url>https://lingo.charego.com</lingo.url>
 	</properties>
 
@@ -52,7 +52,7 @@
 			<plugin>
 				<groupId>org.openjfx</groupId>
 				<artifactId>javafx-maven-plugin</artifactId>
-				<version>0.0.4</version>
+				<version>0.0.5</version>
 				<configuration>
 					<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
 					<options>
@@ -63,6 +63,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
+				<version>3.0.0</version>
 				<configuration>
 					<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
 					<addResourcesToClasspath>true</addResourcesToClasspath>
diff --git a/pom.xml b/pom.xml
index fd4400f..feca97c 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.3.0.RELEASE</version>
+		<version>2.4.1</version>
 	</parent>
 
 	<groupId>com.charego</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 14f3355..f54723c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -25,6 +25,7 @@
 		</dependency>
 
 		<!-- Development Tools -->
+		<!-- Enable hot refreshing of resources -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -35,37 +36,31 @@
 
 	<build>
 		<plugins>
+			<!-- Repackage as executable JAR (java -jar) -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<!-- Enable hot refreshing of resources -->
-					<!-- Add src/main/resources to the classpath -->
-					<!-- Remove duplicate resources from target/classes -->
-					<addResources>true</addResources>
-					<finalName>${project.artifactId}</finalName>
+					<finalName>lingo</finalName>
 				</configuration>
-				<executions>
-					<!-- Repackage as executable JAR (java -jar) -->
-					<execution>
-						<id>repackage</id>
-					</execution>
-				</executions>
 			</plugin>
 			<!-- How to build image directly to Docker daemon: -->
 			<!--     $ mvn jib:dockerBuild -->
 			<!-- How to build image and publish to Docker registry: -->
-			<!--     $ mvn jib:build -Djib.to.image=<myregistry>/<myimage>:latest -->
+			<!--     $ mvn jib:build -->
 			<plugin>
 				<groupId>com.google.cloud.tools</groupId>
 				<artifactId>jib-maven-plugin</artifactId>
-				<version>2.2.0</version>
+				<version>2.7.1</version>
 				<configuration>
 					<!-- Enable this setting to allow pushes to local Docker registry -->
 					<!--<allowInsecureRegistries>true</allowInsecureRegistries>-->
 					<from>
 						<image>adoptopenjdk:11-jre-openj9</image>
 					</from>
+					<to>
+						<image>docker.io/charego/lingo</image>
+					</to>
 					<container>
 						<ports>
 							<port>8080</port>
diff --git a/server/src/main/resources/static/index.html b/server/src/main/resources/static/index.html
index bab22fe..7205e72 100644
--- a/server/src/main/resources/static/index.html
+++ b/server/src/main/resources/static/index.html
@@ -6,8 +6,8 @@
 <link rel="icon" href="favicon.svg" sizes="any" type="image/svg+xml">
 <link rel="stylesheet" href="layout.css">
 <link rel="stylesheet" href="style.css">
-<script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
-<script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@5.4.4/bundles/stomp.umd.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@6.0.0/bundles/stomp.umd.min.js"></script>
 </head>
 <body>
   <div id="vue-app" v-cloak>
diff --git a/server/src/main/resources/static/practice.html b/server/src/main/resources/static/practice.html
index 6a1c83d..230bce2 100644
--- a/server/src/main/resources/static/practice.html
+++ b/server/src/main/resources/static/practice.html
@@ -11,7 +11,7 @@
     <button id="skipButton" type="button">Skip Word</button>
   </div>
 
-  <script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@5.2.0/bundles/stomp.umd.min.js"></script>
+  <script src="//cdn.jsdelivr.net/npm/@stomp/stompjs@6.0.0/bundles/stomp.umd.min.js"></script>
   <script src="practice.js"></script>
 </body>
 </html>