(maint) debian platforms simplify java depends

possible to install java 17 and java 11, package should be flexible to accept either as a dependency
puppetlabs · Apr 20, 2024 · 526d496 · 526d496
1 parent 65c7236
commit 526d496
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).
 
 ## [Unreleased]
 Maintenance:
+  * On all Debian platforms simplify java depends, allow 17 or 11, prefer 17
   * Drop platform 6 fpm support
 
 Bugfix:

diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
@@ -328,17 +328,7 @@
   end
 
   if ! options.is_pe
-    options.java =
-      case options.platform_version
-      when 8
-        if options.dist =~ /buster|bullseye|bookworm|bionic|focal|jammy/
-          'openjdk-17-jre-headless | openjdk-11-jre-headless'
-        end
-      when 7
-        'openjdk-11-jre-headless'
-      else
-        fail "Unknown Puppet Platform Version #{options.platform_version}"
-      end
+    options.java = 'openjdk-17-jre-headless | openjdk-11-jre-headless'
   end
 
   fpm_opts << '--deb-build-depends cdbs'