From 43b0b69b3e10ed18e7f00dd66d704a343499c3c9 Mon Sep 17 00:00:00 2001
From: Michael Fross <michael@fross.org>
Date: Sun, 21 Apr 2024 16:42:53 -0500
Subject: [PATCH] Corrected fraction display error. Updated mvn plugins If you
 just entered `frac` with a base, the title would display a blank base (`1/`)
 There were quite a few plugin versions that were updated in the pom file

---
 .idea/statistic.xml                           |  6 ++++
 pom.xml                                       | 34 ++++++++++++++++---
 snap/snapcraft.yaml                           |  2 +-
 .../org/fross/rpncalc/StackConversions.java   |  2 +-
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 .idea/statistic.xml

diff --git a/.idea/statistic.xml b/.idea/statistic.xml
new file mode 100644
index 0000000..e7f4e89
--- /dev/null
+++ b/.idea/statistic.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Statistic">
+    <option name="fileTypes" value="class;svn-base;svn-work;Extra;gif;png;jpg;jpeg;bmp;tga;tiff;ear;war;zip;jar;iml;iws;ipr;bz2;gz;pyc;xcf" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3e24aa9..ae6e3c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>org.fross</groupId>
 	<artifactId>rpncalc</artifactId>
-	<version>5.2.4</version>
+	<version>5.2.5</version>
 	<packaging>jar</packaging>
 
 	<name>rpncalc</name>
@@ -35,6 +35,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.release>11</maven.compiler.release>
+		<maven.minimum.version>3.6.3</maven.minimum.version>
 	</properties>
 
 	<build>
@@ -46,6 +47,31 @@
 		</resources>
 
 		<plugins>
+			<plugin>
+				<!-- ========================================================================================== -->
+				<!-- Enforce a minimum version of Maven to build                                                -->
+				<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-enforcer-plugin          -->
+				<!-- ========================================================================================== -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.4.1</version>
+				<executions>
+					<execution>
+						<id>enforce-maven</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireMavenVersion>
+									<version>${maven.minimum.version}</version>
+								</requireMavenVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<!-- ========================================================================================== -->
 				<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-resources-plugin         -->
@@ -64,7 +90,7 @@
 				<!-- ========================================================================================== -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.12.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 				</configuration>
@@ -87,7 +113,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.5.2</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -182,7 +208,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.1.1</version>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>chmod</id>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 043cb6d..6450114 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: rpncalc
-version: '5.2.4'
+version: '5.2.5'
 summary: The command line Reverse Polish Notation (RPN) calculator
 description: |
   RPNCalc is an easy to use command line based Reverse Polish
diff --git a/src/main/java/org/fross/rpncalc/StackConversions.java b/src/main/java/org/fross/rpncalc/StackConversions.java
index 339e1ae..5d0dfca 100644
--- a/src/main/java/org/fross/rpncalc/StackConversions.java
+++ b/src/main/java/org/fross/rpncalc/StackConversions.java
@@ -187,7 +187,7 @@ public static String[] cmdFraction(StackObj calcStack, String param) {
 
       // Output the fractional display
       // If there is no fractional result, remove it, so we don't see '0/1'
-      String stackHeader = "-Fraction (Granularity: 1/" + (param) + ")";
+      String stackHeader = "-Fraction (Granularity: 1/" + denominator + ")";
       String result = integerPart + " " + ((numerator.compareTo(BigInteger.ZERO) == 0) ? "" : numerator + "/" + denominator);
 
       // Header Top