Merge pull request #429 from rileynewton/PE-35509-move-clj-parent-to-…

…tk-jetty10 (PE-35509) Add trapperkeeper-webserver-jetty10, tk-metrics 2.0.0
puppetlabs · Nov 28, 2023 · 501e718 · 501e718
2 parents 59bb6e4 + 3a4cf78
commit 501e718
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## [unreleased]
 
+## [7.2.8]
+- add trapperkeeper-webserver-jetty10 version 1.0.4 and trapperkeeper-metrics 2.0.0 using jetty 10
+
 ## [7.2.7]
 - update kitchensink to 3.2.4 to bring in some new functions, and deprecate old interfaces
 

diff --git a/project.clj b/project.clj
@@ -1,8 +1,9 @@
 (def clj-version "1.11.1")
 (def ks-version "3.2.4")
 (def tk-version "4.0.0")
-(def tk-jetty-version "4.5.2")
-(def tk-metrics-version "1.5.1")
+(def tk-jetty-9-version "4.5.2")
+(def tk-jetty-10-version "1.0.4")
+(def tk-metrics-version "2.0.0")
 (def logback-version "1.3.7")
 (def rbac-client-version "1.1.5")
 (def dropwizard-metrics-version "3.2.2")
@@ -110,8 +111,10 @@
                          [puppetlabs/kitchensink ~ks-version :classifier "test"]
                          [puppetlabs/trapperkeeper ~tk-version]
                          [puppetlabs/trapperkeeper ~tk-version :classifier "test"]
-                         [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-version]
-                         [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-version :classifier "test"]
+                         [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-9-version]
+                         [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-9-version :classifier "test"]
+                         [puppetlabs/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version]
+                         [puppetlabs/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version :classifier "test"]
                          [puppetlabs/trapperkeeper-metrics ~tk-metrics-version]
                          [puppetlabs/trapperkeeper-metrics ~tk-metrics-version :classifier "test"]
                          [puppetlabs/trapperkeeper-scheduler "1.1.3"]