Description: Downgrade to Jetty9
Author: Jérôme Charaoui <jerome@riseup.net>
Forwarded: not-needed

The only version of Jetty available in Debian, for now, is Jetty9. However
because of its EOL status, its unlikely to be shipped with trixie (see #1055382)
so once a new version of Jetty is packaged, this patch should be dropped.
Index: puppetdb/resources/puppetlabs/puppetdb/bootstrap.cfg
===================================================================
--- puppetdb.orig/resources/puppetlabs/puppetdb/bootstrap.cfg
+++ puppetdb/resources/puppetlabs/puppetdb/bootstrap.cfg
@@ -4,7 +4,7 @@
 #  https://github.com/puppetlabs/trapperkeeper/wiki/Bootstrapping
 
 # Web Server
-puppetlabs.trapperkeeper.services.webserver.jetty10-service/jetty10-service
+puppetlabs.trapperkeeper.services.webserver.jetty9-service/jetty9-service
 
 # Webrouting
 puppetlabs.trapperkeeper.services.webrouting.webrouting-service/webrouting-service
Index: puppetdb/test-resources/integration-bootstrap.cfg
===================================================================
--- puppetdb.orig/test-resources/integration-bootstrap.cfg
+++ puppetdb/test-resources/integration-bootstrap.cfg
@@ -1,4 +1,4 @@
-puppetlabs.trapperkeeper.services.webserver.jetty10-service/jetty10-service
+puppetlabs.trapperkeeper.services.webserver.jetty9-service/jetty9-service
 puppetlabs.trapperkeeper.services.webrouting.webrouting-service/webrouting-service
 puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-webservice
 puppetlabs.trapperkeeper.services.status.status-service/status-service
Index: puppetdb/test-resources/puppetserver/bootstrap.cfg
===================================================================
--- puppetdb.orig/test-resources/puppetserver/bootstrap.cfg
+++ puppetdb/test-resources/puppetserver/bootstrap.cfg
@@ -2,7 +2,7 @@ puppetlabs.services.request-handler.requ
 puppetlabs.services.jruby.jruby-puppet-service/jruby-puppet-pooled-service
 puppetlabs.services.jruby-pool-manager.jruby-pool-manager-service/jruby-pool-manager-service
 puppetlabs.services.puppet-profiler.puppet-profiler-service/puppet-profiler-service
-puppetlabs.trapperkeeper.services.webserver.jetty10-service/jetty10-service
+puppetlabs.trapperkeeper.services.webserver.jetty9-service/jetty9-service
 puppetlabs.trapperkeeper.services.webrouting.webrouting-service/webrouting-service
 puppetlabs.services.config.puppet-server-config-service/puppet-server-config-service
 puppetlabs.services.master.master-service/master-service
Index: puppetdb/test/puppetlabs/puppetdb/testutils/repl.clj
===================================================================
--- puppetdb.orig/test/puppetlabs/puppetdb/testutils/repl.clj
+++ puppetdb/test/puppetlabs/puppetdb/testutils/repl.clj
@@ -4,7 +4,7 @@
             [puppetlabs.puppetdb.testutils :as testutils]
             [me.raynes.fs :as fs]
             [puppetlabs.puppetdb.cli.services :as svcs :refer [puppetdb-service]]
-            [puppetlabs.trapperkeeper.services.webserver.jetty10-service :refer [jetty10-service]]
+            [puppetlabs.trapperkeeper.services.webserver.jetty9-service :refer [jetty9-service]]
             [puppetlabs.trapperkeeper.core :as tk]
             [puppetlabs.trapperkeeper.app :as tka]
             [clojure.tools.namespace.repl :refer (refresh)]))
@@ -41,7 +41,7 @@
 (defn start [config-path]
   (alter-var-root #'system
                   (fn [_] (tk/boot-services-with-cli-data
-                          [jetty10-service puppetdb-service]
+                          [jetty9-service puppetdb-service]
                           {:config config-path}))))
 
 (defn stop []
Index: puppetdb/test/puppetlabs/puppetdb/testutils/services.clj
===================================================================
--- puppetdb.orig/test/puppetlabs/puppetdb/testutils/services.clj
+++ puppetdb/test/puppetlabs/puppetdb/testutils/services.clj
@@ -10,7 +10,7 @@
             [clojure.walk :as walk]
             [puppetlabs.trapperkeeper.app :as tk-app :refer [get-service]]
             [puppetlabs.trapperkeeper.testutils.bootstrap :as tkbs]
-            [puppetlabs.trapperkeeper.services.webserver.jetty10-service :refer [jetty10-service]]
+            [puppetlabs.trapperkeeper.services.webserver.jetty9-service :refer [jetty9-service]]
             [puppetlabs.trapperkeeper.services.webrouting.webrouting-service :refer [webrouting-service]]
             [puppetlabs.trapperkeeper.services.status.status-service :refer [status-service]]
             [puppetlabs.trapperkeeper.services.scheduler.scheduler-service :refer [scheduler-service]]
@@ -78,7 +78,7 @@
 (def ^:dynamic *server* nil)
 
 (def default-services
-  [#'jetty10-service
+  [#'jetty9-service
    #'webrouting-service
    #'puppetdb-service
    #'command-service
Index: puppetdb/project.clj
===================================================================
--- puppetdb.orig/project.clj
+++ puppetdb/project.clj
@@ -47,7 +47,7 @@
    '[[ring/ring-mock "debian"]
      [puppetlabs/trapperkeeper "debian" :classifier "test"]
      [puppetlabs/kitchensink "debian" :classifier "test"]
-     [com.puppetlabs/trapperkeeper-webserver-jetty10 "debian" :classifier "test"]
+     [puppetlabs/trapperkeeper-webserver-jetty9 "debian" :classifier "test"]
      [org.flatland/ordered "debian"]
      [org.clojure/test.check "debian"]
      [com.gfredericks/test.chuck "debian"]
@@ -146,7 +146,7 @@
                  [puppetlabs/stockpile "debian"]
                  [puppetlabs/structured-logging "debian"]
                  [puppetlabs/trapperkeeper "debian"]
-                 [com.puppetlabs/trapperkeeper-webserver-jetty10 "debian"]
+                 [puppetlabs/trapperkeeper-webserver-jetty9 "debian"]
                  [puppetlabs/trapperkeeper-metrics "debian" :exclusions [io.dropwizard.metrics/metrics-core]]
                  [puppetlabs/trapperkeeper-status "debian"]
                  [puppetlabs/trapperkeeper-authorization "debian"]