From 200b27e03ccb52e9a11e7e687758bcbc73976a27 Mon Sep 17 00:00:00 2001
From: tim holloway <timh@mousetech.com>
Date: Fri, 1 Mar 2024 18:21:14 -0500
Subject: [PATCH] Added version display to layout page footer

---
 pom.xml                                               |  4 ++--
 src/main/java/com/mousetech/gourmetj/AppBean.java     | 11 ++++++++++-
 .../META-INF/resources/WEB-INF/layout/layout.xhtml    |  5 +++--
 src/main/resources/application.yml                    |  3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a073b2..845e081 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.mousetech.gourmet</groupId>
     <artifactId>gourmetj</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <packaging>jar</packaging>
 
     <name>GourmetJ</name>
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.3</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
diff --git a/src/main/java/com/mousetech/gourmetj/AppBean.java b/src/main/java/com/mousetech/gourmetj/AppBean.java
index 98a3019..2330515 100644
--- a/src/main/java/com/mousetech/gourmetj/AppBean.java
+++ b/src/main/java/com/mousetech/gourmetj/AppBean.java
@@ -3,6 +3,8 @@ package com.mousetech.gourmetj;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Value;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.faces.model.SelectItem;
 import jakarta.inject.Named;
@@ -47,5 +49,12 @@ public class AppBean {
 			new SelectItem(RecipeSearchType.rst_BY_INGREDIENT.ordinal(),
 					"Ingredient"));
 		return list;
-	}	
+	}
+	
+	@Value("${appVersion}")
+	String appVersion = "Not Supplied.";
+	
+	public String getAppVersion() {
+		return appVersion;
+	}
 }
diff --git a/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml b/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml
index 4240bc4..b14be12 100644
--- a/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml
+++ b/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml
@@ -18,7 +18,7 @@
             </h:head>
             <h:body>
                 <h1>
-                    <ui:insert name="title">Gourmet Recipe Manager (web version)</ui:insert>
+                    <ui:insert name="title">Gourmet Recipe Manager (web version #{appBean.appVersion})</ui:insert>
                 </h1>
                 <p:ajaxStatus onerror="PF('opError').show()"/>
                 <ui:insert name="content">
@@ -28,10 +28,11 @@
                 </ui:insert>
                 <!--  -->
                 <div id="footer">
+                    <h:outputText value="Version #{appBean.appVersion}"/><br/>
                     (C) 2021, 2024 Tim Holloway, Licensed under
                      the Common Development and Distribution License (CDDL).
                     <p>Based on Gourmet Recipe Manager by T.
-                        Hinkle</p>
+                        Hinkle.</p>
                 </div>
                 <!--  -->
             </h:body>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d9bee3e..d77b45e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,6 +21,9 @@ spring:
       ddl-auto: none
     database-platform: org.hibernate.dialect.MySQLDialect
 
+# From Maven POM:
+appVersion: "@project.version@"
+
 # Tracking-modes prevent URL rewrite jsessionid on Primecases
 # resources. Which causes "400" errors on initial main.jsf fetch.
 server: