Merge pull request #629 from h0tw1r3/debian12

(RE-16550): Debian 12 bookworm FOSS build target

CHANGELOG.md

@@ -3,6 +3,9 @@
 This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).
 
 ## [Unreleased]
+* Drop platform 6 fpm support
+* On all Debian platforms simplify java depends, allow 17 or 11, prefer 17
+* Add Debian 12 bookworm as a FOSS build target
 
 ## [2.6.1]
 * Fix the ability to add a resources directory to a project with :include-dir by copying the resources to the staging directory directly.

resources/puppetlabs/lein-ezbake/template/foss/ext/build_defaults.yaml

@@ -1,6 +1,6 @@
 ---
 default_cow: 'base-bionic-i386.cow'
-cows: 'base-bionic-i386.cow base-buster-i386.cow base-focal-i386.cow base-bullseye-i386.cow base-jammy-i386.cow'
+cows: 'base-bionic-i386.cow base-buster-i386.cow base-focal-i386.cow base-bullseye-i386.cow base-jammy-i386.cow base-bookworm-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_key: '4528B6CD9E61EF26'

resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb

@@ -195,7 +195,7 @@
           else
             fail "Unrecognized el os version #{options.os_version}"
           end
-        when 6..7
+        when 7
           'java-1.8.0-openjdk-headless'
         else
           fail "Unknown Puppet Platform Version #{options.platform_version}"
@@ -219,7 +219,7 @@
         case options.platform_version
         when 8
           'java-11-openjdk-headless'
-        when 6..7
+        when 7
           if options.os_version > 12
             'java-11-openjdk-headless'
           else
@@ -328,21 +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 6..7
-        if options.dist =~ /buster|bullseye/ # debian 10+ uses java11
-          'openjdk-11-jre-headless'
-        else
-          'openjdk-8-jre-headless'
-        end
-      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'