Merge pull request #97 from jonathannewman/PE-37632/main/update-depen…

…dencies (PE-37632) update clj-parent, dependencies, prepare for release
puppetlabs · Feb 13, 2024 · 47a8d85 · 47a8d85
2 parents 0ffdc4a + d323497
commit 47a8d85
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.2.0
+* update to clj-parent 7.3.7, and change test dependency to jetty 10.
+* remove unused ring-defaults dependency
+* update codeowners
+
 ## 1.1.0
 
 This is a feature release.

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @puppetlabs/dumpling
+* @puppetlabs/dumpling @puppetlabs/skeletor @puppetlabs/nimbus
diff --git a/project.clj b/project.clj
@@ -1,28 +1,23 @@
-(defproject puppetlabs/trapperkeeper-status "1.1.3-SNAPSHOT"
+(defproject puppetlabs/trapperkeeper-status "1.2.0-SNAPSHOT"
   :description "A trapperkeeper service for getting the status of other trapperkeeper services."
   :url "https://github.com/puppetlabs/trapperkeeper-status"
   :license {:name "Apache License, Version 2.0"
             :url "http://www.apache.org/licenses/LICENSE-2.0"}
 
   :min-lein-version "2.9.0"
 
-  :parent-project {:coords [puppetlabs/clj-parent "6.0.1"]
+  :parent-project {:coords [puppetlabs/clj-parent "7.3.7"]
                    :inherit [:managed-dependencies]}
 
   :pedantic? :abort
 
-  :exclusions [org.clojure/clojure]
-
   :dependencies [[org.clojure/clojure]
-
                  [cheshire]
                  [slingshot]
                  [prismatic/schema]
                  [trptcolin/versioneer]
-                 [ring/ring-defaults]
                  [org.clojure/java.jmx]
                  [org.clojure/tools.logging]
-
                  [puppetlabs/kitchensink]
                  [puppetlabs/trapperkeeper]
                  [puppetlabs/trapperkeeper-scheduler]
@@ -39,8 +34,8 @@
   :profiles {:dev {:dependencies [[org.bouncycastle/bcpkix-jdk18on]
                                   [puppetlabs/http-client]
                                   [puppetlabs/trapperkeeper :classifier "test"]
-                                  [puppetlabs/trapperkeeper-webserver-jetty9]
+                                  [com.puppetlabs/trapperkeeper-webserver-jetty10]
                                   [puppetlabs/kitchensink :classifier "test"]]}}
 
-  :plugins [[lein-parent "0.3.8"]
-            [puppetlabs/i18n "0.8.0" :hooks false]])
+  :plugins [[lein-parent "0.3.9"]
+            [puppetlabs/i18n "0.9.2" :hooks false]])
diff --git a/test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj b/test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj
@@ -10,7 +10,7 @@
     [puppetlabs.trapperkeeper.services.status.status-proxy-service :refer [status-proxy-service]]
     [puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
     [puppetlabs.trapperkeeper.services.scheduler.scheduler-service :as scheduler-service]
-    [puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9-service]))
+    [puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]))
 
 (use-fixtures :once schema-test/validate-schemas)
 
@@ -55,7 +55,7 @@
     ; Start status service
     (with-app-with-config
       status-app
-      [jetty9-service/jetty9-service
+      [jetty10-service/jetty10-service
        webrouting-service/webrouting-service
        status-service
        foo-service
@@ -65,7 +65,7 @@
       ; Start the proxy service
       (with-app-with-config
         proxy-app
-        [jetty9-service/jetty9-service
+        [jetty10-service/jetty10-service
          webrouting-service/webrouting-service
          status-proxy-service]
         status-proxy-service-config
@@ -149,7 +149,7 @@
       (with-app-with-config
         ; Start status service
         status-app
-        [jetty9-service/jetty9-service
+        [jetty10-service/jetty10-service
          webrouting-service/webrouting-service
          status-service
          scheduler-service/scheduler-service
@@ -158,7 +158,7 @@
         ; Start the proxy service
         (with-app-with-config
           proxy-app
-          [jetty9-service/jetty9-service
+          [jetty10-service/jetty10-service
            webrouting-service/webrouting-service
            status-proxy-service]
           status-proxy-service-config
@@ -182,7 +182,7 @@
             (with-test-logging
               (with-app-with-config
                 proxy-app
-                [jetty9-service/jetty9-service
+                [jetty10-service/jetty10-service
                  webrouting-service/webrouting-service
                  status-proxy-service]
                 bad-config))))))
@@ -197,7 +197,7 @@
             (with-test-logging
               (with-app-with-config
                 proxy-app
-                [jetty9-service/jetty9-service
+                [jetty10-service/jetty10-service
                  webrouting-service/webrouting-service
                  status-proxy-service]
                 bad-config))))))
@@ -212,7 +212,7 @@
             (with-test-logging
               (with-app-with-config
                 proxy-app
-                [jetty9-service/jetty9-service
+                [jetty10-service/jetty10-service
                  webrouting-service/webrouting-service
                  status-proxy-service]
                 bad-config)))))))
diff --git a/test/puppetlabs/trapperkeeper/services/status/status_service_test.clj b/test/puppetlabs/trapperkeeper/services/status/status_service_test.clj
@@ -11,7 +11,7 @@
             [puppetlabs.trapperkeeper.services.status.status-core :as status-core]
             [puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
             [puppetlabs.trapperkeeper.services.authorization.authorization-service :as tk-auth]
-            [puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9-service]
+            [puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]
             [puppetlabs.trapperkeeper.services.scheduler.scheduler-service :as scheduler-service]
             [puppetlabs.kitchensink.core :as ks]))
 
@@ -47,21 +47,21 @@
   (:status (parse-response resp true)))
 
 (defmacro with-status-service-with-config
-  "Macro to start the status service and its dependencies (jetty9 and
+  "Macro to start the status service and its dependencies (jetty10 and
   webrouting service), along with any other services desired, with the given
   config"
   [app services config & body]
   `(with-app-with-config
      ~app
-     (concat [jetty9-service/jetty9-service
+     (concat [jetty10-service/jetty10-service
               webrouting-service/webrouting-service
               scheduler-service/scheduler-service
               status-service] ~services)
      ~config
      (do ~@body)))
 
 (defmacro with-status-service
-  "Macro to start the status service and its dependencies (jetty9 and
+  "Macro to start the status service and its dependencies (jetty10 and
   webrouting service), along with any other services desired. Provides
   a default tk config"
   [app services & body]
@@ -126,7 +126,7 @@
 
 (deftest get-status-test
   (with-status-service app [foo-service
-                            jetty9-service/jetty9-service
+                            jetty10-service/jetty10-service
                             webrouting-service/webrouting-service
                             status-service]
     (let [svc (get-service app :StatusService)]
@@ -198,7 +198,7 @@
   (testing "can mount status endpoint at alternate location"
     (with-app-with-config
       app
-      [jetty9-service/jetty9-service
+      [jetty10-service/jetty10-service
        webrouting-service/webrouting-service
        scheduler-service/scheduler-service
        status-service]
@@ -211,7 +211,7 @@
   (testing "with auth service running and cert auth enabled for endpoint"
     (with-app-with-config
       app
-      [jetty9-service/jetty9-service
+      [jetty10-service/jetty10-service
        webrouting-service/webrouting-service
        scheduler-service/scheduler-service
        status-service
@@ -236,7 +236,7 @@
   (testing "with auth service running and cert auth disabled for endpoint"
     (with-app-with-config
       app
-      [jetty9-service/jetty9-service
+      [jetty10-service/jetty10-service
        webrouting-service/webrouting-service
        scheduler-service/scheduler-service
        status-service
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @puppetlabs/dumpling
		* @puppetlabs/dumpling @puppetlabs/skeletor @puppetlabs/nimbus