Merge pull request #294 from OpenVoxProject/java17

Drop Java 17 support

Author: bastelfreak

.github/workflows/main.yml

@@ -27,7 +27,6 @@ jobs:
           # terminus rspec tests
           - rspec/pup-main
           # agent, server, db integration tests
-          - int/openjdk17/pup-main/srv-main/pg-16/rich
           - int/openjdk21/pup-main/srv-main/pg-17/rich
           - int/openjdk21/pup-main/srv-main/pg-18/rich
 
@@ -42,7 +41,7 @@ jobs:
         # Special cases
         include:
           # lint
-          - flavor: lint/openjdk17
+          - flavor: lint/openjdk21
             os: ubuntu-24.04
             ruby: '3.4'
 
@@ -57,16 +56,6 @@ jobs:
           - flavor: core+ext/openjdk21/pg-16
             os: ubuntu-24.04
             ruby: '3.4'
-          # jdk 17
-          - flavor: core+ext/openjdk17/pg-18
-            os: ubuntu-24.04
-            ruby: '3.4'
-          - flavor: core+ext/openjdk17/pg-17
-            os: ubuntu-24.04
-            ruby: '3.4'
-          - flavor: core+ext/openjdk17/pg-16
-            os: ubuntu-24.04
-            ruby: '3.4'
 
     steps:
       - name: Compute job outputs

src/puppetlabs/puppetdb/cli/util.clj

@@ -16,18 +16,18 @@
   [version]
   (cond
     (re-matches #"1\.[1234567]($|(\..*))" version) :unsupported
-    (re-matches #"1\.[89]($|(\..*))" version) :deprecated
-    (re-matches #"10($|(\..*))" version) :deprecated
-    (re-matches #"11($|(\..*))" version) :tested
-    (re-matches #"17($|(\..*))" version) :official
-    (re-matches #"21($|(\..*))" version) :tested
+    (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
     :else :unknown))
 
 (defn jdk-unsupported-msg [version]
   (let [status (jdk-support-status version)]
     (case status
-      (:unknown) {:warn (trs "JDK {0} is neither tested nor supported. Please use JDK 11, 17 or 21" version)}
-      (:deprecated) {:warn (trs "JDK {0} is deprecated, please upgrade to JDK 11, 17 or 21" version)}
+      (:unknown) {:warn (trs "JDK {0} is neither tested nor supported. Please use JDK 21" version)}
+      (:deprecated) {:warn (trs "JDK {0} is deprecated, please upgrade to JDK 21" version)}
       (:official :tested) nil
       {:error (trs "PuppetDB doesn''t support JDK {0}" version)})))
 

src/puppetlabs/puppetdb/utils.clj

@@ -14,7 +14,7 @@
             [clojure.walk :as walk])
   (:import
    [clojure.lang ExceptionInfo]
-   [java.net MalformedURLException URISyntaxException URL]
+   [java.net MalformedURLException URI URISyntaxException]
    [java.nio ByteBuffer CharBuffer]
    [java.nio.channels SocketChannel]
    [java.nio.charset Charset CoderResult StandardCharsets]
@@ -190,21 +190,20 @@
   "Converts the `base-url' map to an ASCII URL.  May throw
    MalformedURLException or URISyntaxException."
   [{:keys [protocol host port prefix version] :as _base-url} :- base-url-schema]
-  (-> (URL. protocol host port
-            (str prefix "/" (name (or version :v4))))
-      .toURI .toASCIIString))
+  (-> (URI. protocol nil host port
+            (str prefix "/" (name (or version :v4))) nil nil)
+      .toASCIIString))
 
 (pls/defn-validated base-url->str-no-path :- s/Str
   "Converts the `base-url' map to an ASCII URL minus the path element. This can
   be used to build a full URL when you have an absolute path."
   [{:keys [protocol host port] :as _base-url} :- base-url-schema]
-  (-> (URL. protocol host port "")
-      .toURI .toASCIIString))
+  (-> (URI. protocol nil host port "" nil nil)
+      .toASCIIString))
 
 (defn base-url->str-with-prefix
   [{:keys [protocol host port prefix] :as _base-url}]
-  (-> (java.net.URL. protocol host port prefix)
-      .toURI
+  (-> (URI. protocol nil host port prefix nil nil)
       .toASCIIString))
 
 (defn describe-bad-base-url

test/puppetlabs/puppetdb/cli/util_test.clj

@@ -13,12 +13,15 @@
   (is (= :unknown (jdk-support-status "huh?")))
   (is (= :unsupported (jdk-support-status "1.7")))
   (is (= :unsupported (jdk-support-status "1.7.0")))
-  (is (= :deprecated (jdk-support-status "1.8")))
-  (is (= :deprecated (jdk-support-status "1.8.0")))
-  (is (= :deprecated (jdk-support-status "1.9")))
-  (is (= :deprecated (jdk-support-status "1.9.0")))
-  (is (= :deprecated (jdk-support-status "10")))
-  (is (= :deprecated (jdk-support-status "10.0")))
-  (is (= :tested (jdk-support-status "11.0")))
-  (is (= :tested (jdk-support-status "11.0.7")))
-  (is (= :official (jdk-support-status "17.0.4"))))
+  (is (= :unsupported (jdk-support-status "1.8")))
+  (is (= :unsupported (jdk-support-status "1.8.0")))
+  (is (= :unsupported (jdk-support-status "1.9")))
+  (is (= :unsupported (jdk-support-status "1.9.0")))
+  (is (= :unsupported (jdk-support-status "10")))
+  (is (= :unsupported (jdk-support-status "10.0")))
+  (is (= :unsupported (jdk-support-status "11.0")))
+  (is (= :unsupported (jdk-support-status "11.0.7")))
+  (is (= :unsupported (jdk-support-status "17.0.4")))
+  (is (= :official (jdk-support-status "21")))
+  (is (= :official (jdk-support-status "21.0")))
+  (is (= :official (jdk-support-status "21.0.4"))))

test/puppetlabs/puppetdb/testutils/dashboard.clj

@@ -4,8 +4,8 @@
   "Similar to puppetlabs.puppetdb.utils/base-url->str but doesn't
   include a version as the dashboard page does not include a version"
   [{:keys [protocol host port prefix] :as _base-url}]
-  (-> (java.net.URL. protocol host port prefix)
-      .toURI .toASCIIString))
+  (-> (java.net.URI. protocol nil host port prefix nil nil)
+      .toASCIIString))
 
 (defn dashboard-page? [{:keys [body] :as _req}]
   (.contains body "<title>OpenvoxDB: Dashboard</title>"))