From 62a63815d1472b6338e90a8b215276999724b85b Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:32:12 -0800
Subject: [PATCH 1/2] Remove platform version complexity for Java version

OpenVox only supports platform 7 and 8, and we don't really need to worry about ancient el8 being weird. We build OpenVox with Java 11, so make this the base version, and ideally use 17 when available.
---
 .../lein-ezbake/template/global/ext/fpm.rb    | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
index a8a116a..93c09fd 100755
--- a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
+++ b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
@@ -189,24 +189,13 @@
     options.systemd_el = 1
   elsif options.operating_system == :el && options.os_version >= 7 # systemd el
     if ! options.is_pe
-      fpm_opts << "--depends tzdata-java"
       options.java =
-        case options.platform_version
-        when 8
-          # rpm on Redhat 7 may not support OR dependencies
-          if options.os_version == 7
-            'java-11-openjdk-headless'
-          elsif options.os_version == 8
-            '(java-17-openjdk-headless or java-11-openjdk-headless)'
-          elsif options.os_version >= 9
-            'java-17-openjdk-headless'
-          else
-            fail "Unrecognized el os version #{options.os_version}"
-          end
-        when 7
+        if options.os_version == 7
           'java-11-openjdk-headless'
+        elsif options.os_version >= 8
+          'java-17-openjdk-headless'
         else
-          fail "Unknown Puppet Platform Version #{options.platform_version}"
+          fail "Unrecognized el os version #{options.os_version}"
         end
     end
 
@@ -223,19 +212,7 @@
     options.systemd_sles = 1
     options.sles = 1
     if ! options.is_pe
-      options.java =
-        case options.platform_version
-        when 8
-          'java-11-openjdk-headless'
-        when 7
-          if options.os_version > 12
-            'java-11-openjdk-headless'
-          else
-            'java-1_8_0-openjdk-headless'
-          end
-        else
-          fail "Unknown Puppet Platform Version #{options.platform_version}"
-        end
+      options.java = 'java-11-openjdk-headless'
     end
   elsif options.operating_system == :sles #old sles
     options.sysvinit = 1

From 2eb83b3c843127f38e35c15f4043b694f981c9e3 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:18:19 -0800
Subject: [PATCH 2/2] Fix tests after inclusion of package-name

---
 .github/workflows/pr.yml                  | 2 +-
 test/unit/puppetlabs/ezbake/core_test.clj | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 18614b5..fb937cd 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' ]
+        java: [ '11, '17' ]
     env:
       LEIN_HOME: local
 
diff --git a/test/unit/puppetlabs/ezbake/core_test.clj b/test/unit/puppetlabs/ezbake/core_test.clj
index d1140dc..560f834 100644
--- a/test/unit/puppetlabs/ezbake/core_test.clj
+++ b/test/unit/puppetlabs/ezbake/core_test.clj
@@ -40,6 +40,7 @@
                     :is-pe-build "false"
                     :reload-timeout "'120'"
                     :bootstrap-source "'bootstrap-cfg'"
+                    :package-name "'dummy'"
                     :debian-interested-install-triggers ()
                     :group "'dummy'"
                     :java-args "'-Xmx192m'"