Merge pull request OpenVoxProject#62 from OpenVoxProject/java-21-supported

Consider Java 21 "supported"

Author: bastelfreak

.github/workflows/pr-testing.yml

@@ -85,25 +85,18 @@ jobs:
   build:
     name: build openvox-server
     runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ['11', '17']
     steps:
       - name: checkout repo
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: setup java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.version }}
       - name: setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2'
           bundler-cache: true
+      # uses the Dockerfile to build openvox-server in a container
+      # the container hardcodes the java version
       - name: build it
         run: bundle exec rake vox:build
 

project.clj

@@ -137,6 +137,7 @@
                                             (throw unsupported-ex))
                                         11 ["-Djava.security.properties==./dev-resources/java.security.jdk11on-fips"]
                                         17 ["-Djava.security.properties==./dev-resources/java.security.jdk11on-fips"]
+                                        21 ["-Djava.security.properties==./dev-resources/java.security.jdk11on-fips"]
                                         (do)))}
              :fips [:defaults :fips-deps]
 
@@ -168,7 +169,7 @@
                                                [puppetlabs/puppetserver ~ps-version]
                                                [com.puppetlabs/trapperkeeper-webserver-jetty10]
                                                [puppetlabs/trapperkeeper-metrics]]
-                      :plugins [[puppetlabs/lein-ezbake "2.6.3-SNAPSHOT-openvox"]]
+                      :plugins [[puppetlabs/lein-ezbake "3.0.1-SNAPSHOT"]]
                       :name "puppetserver"}
              :uberjar {:dependencies [[org.bouncycastle/bcpkix-jdk18on]
                                       [com.puppetlabs/trapperkeeper-webserver-jetty10]]
@@ -249,7 +250,7 @@
                   (str "-Xms" (heap-size "1G"))
                   (str "-Xmx" (heap-size "2G"))
                   "-XX:+IgnoreUnrecognizedVMOptions"]
-                 (if (= 17 (java.lang.Integer/parseInt major))
+                 (if (>= 17 (java.lang.Integer/parseInt major))
                    ["--add-opens" "java.base/sun.nio.ch=ALL-UNNAMED" "--add-opens" "java.base/java.io=ALL-UNNAMED"]
                    [])))
 

resources/ext/cli_defaults/cli-defaults.sh.erb

@@ -7,7 +7,7 @@ fi
 java_version=$($JAVA_BIN -version 2>&1 | head -1 | awk -F\" '{ print $2 }')
 java_major_version=$(echo $java_version | awk -F. '{ print $1 }')
 
-if [[ $java_major_version -eq 17 ]]; then
+if [[ $java_major_version -ge 17 ]]; then
 
 	echo $JAVA_ARGS | grep "add-opens" &>/dev/null
 	if [[ 0 -ne $? ]]; then

src/clj/puppetlabs/services/master/master_service.clj

@@ -83,15 +83,16 @@
     (re-matches #"1\.[1234567]($|(\..*))" version) :unsupported
     (re-matches #"1\.[89]($|(\..*))" version) :deprecated
     (re-matches #"10($|(\..*))" version) :deprecated
-    (re-matches (re-pattern (str 11 "($|(\\..*))")) version) :official
+    (re-matches #"11($|(\..*))" version) :official
     (re-matches #"17($|(\..*))" version) :official
+    (re-matches #"21($|(\..*))" 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 or 17" version))
-      (:deprecated) (log/warn (i18n/trs "JDK {0} is deprecated, please upgrade to JDK 11 or 17" version))
+      (: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))
       (:official) nil
       (:unsupported) (log/warn (i18n/trs "Puppetserver doesn't support JDK {0}" version)))))
 

test/unit/puppetlabs/services/master/master_core_test.clj

@@ -469,7 +469,10 @@
   (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 (= :official (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"))))
 
 (deftest v4-routes-test
   (with-redefs [jruby-core/borrow-from-pool-with-timeout (fn [_ _ _] {:jruby-puppet (Object.)})