Skip to content

Mark java 25 as supported & Drop support for Java 17 #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bastelfreak merged 1 commit into from
Jun 2, 2026
+21 −17
Merged

Mark java 25 as supported & Drop support for Java 17 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/clj/puppetlabs/services/master/master_service.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,19 @@
[version]
(cond
(re-matches #"1\.[1234567]($|(\..*))" version) :unsupported
(re-matches #"1\.[89]($|(\..*))" version) :deprecated
(re-matches #"10($|(\..*))" version) :deprecated
(re-matches #"11($|(\..*))" version) :official
(re-matches #"17($|(\..*))" version) :official
(re-matches #"1\.[89]($|(\..*))" version) :unsupported
(re-matches #"10($|(\..*))" version) :unsupported
(re-matches #"11($|(\..*))" version) :unsupported
(re-matches #"17($|(\..*))" version) :unsupported
(re-matches #"21($|(\..*))" version) :official
(re-matches #"25($|(\..*))" version) :official
:else :unknown))

(defn log-java-deprecation-message [version]
(let [status (jdk-support-status version)]
(case status
(:unknown) (log/warn (i18n/trs "JDK {0} is neither tested nor supported. Please use JDK 11, 17 or 21" version))
(:deprecated) (log/warn (i18n/trs "JDK {0} is deprecated, please upgrade to JDK 11, 17 or 21" version))
(:unknown) (log/warn (i18n/trs "JDK {0} is neither tested nor supported. Please use JDK 21 or 25" version))
(:deprecated) (log/warn (i18n/trs "JDK {0} is deprecated, please upgrade to JDK 21 or 25" version))
(:official) nil
(:unsupported) (log/warn (i18n/trs "Puppetserver doesn't support JDK {0}" version)))))

Expand Down
25 changes: 14 additions & 11 deletions test/unit/puppetlabs/services/master/master_core_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,19 +460,22 @@
(deftest jdk-support-status-test
(is (= :unsupported (master-service/jdk-support-status "1.7")))
(is (= :unsupported (master-service/jdk-support-status "1.7.0")))
(is (= :deprecated (master-service/jdk-support-status "1.8")))
(is (= :deprecated (master-service/jdk-support-status "1.8.0")))
(is (= :deprecated (master-service/jdk-support-status "1.9")))
(is (= :deprecated (master-service/jdk-support-status "1.9.0")))
(is (= :deprecated (master-service/jdk-support-status "10")))
(is (= :deprecated (master-service/jdk-support-status "10.0")))
(is (= :official (master-service/jdk-support-status "11.0")))
(is (= :official (master-service/jdk-support-status "11.0.7")))
(is (= :official (master-service/jdk-support-status "17.0")))
(is (= :official (master-service/jdk-support-status "17.0.4")))
(is (= :unsupported (master-service/jdk-support-status "1.8")))
(is (= :unsupported (master-service/jdk-support-status "1.8.0")))
(is (= :unsupported (master-service/jdk-support-status "1.9")))
(is (= :unsupported (master-service/jdk-support-status "1.9.0")))
(is (= :unsupported (master-service/jdk-support-status "10")))
(is (= :unsupported (master-service/jdk-support-status "10.0")))
(is (= :unsupported (master-service/jdk-support-status "11.0")))
(is (= :unsupported (master-service/jdk-support-status "11.0.7")))
(is (= :unsupported (master-service/jdk-support-status "17.0")))
(is (= :unsupported (master-service/jdk-support-status "17.0.4")))
(is (= :official (master-service/jdk-support-status "21")))
(is (= :official (master-service/jdk-support-status "21.0")))
(is (= :official (master-service/jdk-support-status "21.0.8"))))
(is (= :official (master-service/jdk-support-status "21.0.8")))
(is (= :official (master-service/jdk-support-status "25")))
(is (= :official (master-service/jdk-support-status "25.0")))
(is (= :official (master-service/jdk-support-status "25.0.3"))))

(deftest v4-routes-test
(with-redefs [jruby-core/borrow-from-pool-with-timeout (fn [_ _ _] {:jruby-puppet (Object.)})
Expand Down
Loading