Skip to content

Backport Jetty 12 and dep bumps to 8.x #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nmburgan wants to merge 14 commits into
base: 8.x
Choose a base branch
from
+57 −75
Open

Backport Jetty 12 and dep bumps to 8.x #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3541f60
Update dependencies for Jetty 12 migration
austb Dec 27, 2025
c6f0202
More dep bumps
nmburgan May 11, 2026
db1c943
Un-variablize ring-core version
nmburgan May 11, 2026
675ce46
Update dependency ring:ring-core to v1.15.4
renovate[bot] May 11, 2026
0e5f121
Update dependency org.clojure:tools.namespace to v1
renovate[bot] May 11, 2026
7209d28
Update dependency net.logstash.logback:logstash-logback-encoder to v9
renovate[bot] May 11, 2026
203e234
Use Ruby 4 for builder image and cache it
nmburgan May 12, 2026
014ece6
Bump min lein version to 2.12
nmburgan May 12, 2026
2ee4e44
Update ezbake to 2.7.7
nmburgan May 12, 2026
34bd1f2
Bump actions/cache from 4 to 5
dependabot[bot] May 13, 2026
51a3a27
Update dependency org.openvoxproject:trapperkeeper-webserver to v12.0.2
renovate[bot] May 13, 2026
834e2f6
Update dependency org.clojure:clojure to v1.12.5
renovate[bot] May 13, 2026
744546a
Update slf4j-version to v2.0.18
renovate[bot] May 13, 2026
4bf845f
Update dependency org.ow2.asm:asm to v9.10
renovate[bot] May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions .github/workflows/pr-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,26 @@ jobs:
- name: setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: '4.0'
bundler-cache: true
# uses the Dockerfile to build openvox-server in a container
# the container hardcodes the java version
- id: docker-cache
uses: actions/cache/restore@v5
with:
path: /tmp/ezbake-builder.tar
key: docker-ezbake-${{ hashFiles('Dockerfile') }}
- name: load or build docker image
run: |
if [[ -f /tmp/ezbake-builder.tar ]]; then
docker load -i /tmp/ezbake-builder.tar
else
docker build -t ezbake-builder .
docker save ezbake-builder -o /tmp/ezbake-builder.tar
fi
- uses: actions/cache/save@v5
if: always() && steps.docker-cache.outputs.cache-hit != 'true'
with:
path: /tmp/ezbake-builder.tar
key: docker-ezbake-${{ hashFiles('Dockerfile') }}
- name: build it
run: bundle exec rake vox:build
- name: get version
Expand Down
29 changes: 13 additions & 16 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
FROM almalinux:9
FROM ruby:4.0-bookworm
Comment thread
nmburgan marked this conversation as resolved.

WORKDIR /
RUN apt-get update && \
apt-get install -y --no-install-recommends \
openjdk-17-jdk-headless \
rpm \
&& rm -rf /var/lib/apt/lists/*

RUN dnf install -y --enablerepo=crb vim wget git rpm-build java-17-openjdk java-17-openjdk-devel libyaml-devel zlib zlib-devel gcc-c++ patch readline readline-devel libffi-devel openssl-devel make bzip2 autoconf automake libtool bison sqlite-devel
RUN wget https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
RUN chmod a+x lein
RUN mv lein /usr/local/bin
RUN wget -q https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer -O- | bash
# todo: it would be great if we could get the used ruby version from openvox-agent and use it here
# and maybe don't randomly download rbenv and leiningen
# and how bad is it that we hardcode java 11 above?
RUN /bin/bash --login -c 'rbenv install 3.2.9'
RUN /bin/bash --login -c 'rbenv global 3.2.9'
RUN git config --global user.email "openvox@voxpupuli.org"
RUN git config --global user.name "Vox Pupuli"
RUN git config --global --add safe.directory /code
RUN wget -q https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -O /usr/local/bin/lein && \
chmod a+x /usr/local/bin/lein

CMD ["tail -f /dev/null"]
RUN git config --global user.email "openvox@voxpupuli.org" && \
git config --global user.name "Vox Pupuli" && \
git config --global --add safe.directory /code

CMD ["tail", "-f", "/dev/null"]
79 changes: 24 additions & 55 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,10 @@
heap-size-from-profile-clj
default-heap-size))

(def slf4j-version "2.0.17")
(def slf4j-version "2.0.18")
(def i18n-version "1.0.4")
(def logback-version "1.3.16")
(def logback-version "1.5.32")
(def jackson-version "2.21.3")
;; DO NOT UPGRADE PAST 1.14+! In 1.15.x, Content-Length is added to the
;; response headers automatically rather than transferring it chunked,
;; and also string flushing behavior is changed, and some part of the system
;; does not handle one or both of these correctly. We need to debug this and
;; fix it before upgrading.
(def ring-core-version "1.14.2")

(require '[clojure.string :as str]
'[leiningen.core.main :as main])
(defn fail-if-logback->1-3!
"Fails the build if logback-version is > 1.3.x."
[logback-version]
(let [[x y] (->> (str/split (str logback-version) #"\.")
(take 2)
(map #(Integer/parseInt %)))]
(when (or (> x 1)
(and (= x 1) (> y 3)))
(main/abort (format "logback-version %s is not supported by Jetty 10. Must be 1.3.x until we update to Jetty 12." logback-version)))))

(fail-if-logback->1-3! logback-version)

(defn fail-if-ring-core->1-14!
"Fails the build if ring-core version is > 1.14.x."
[ring-core-version]
(let [[x y] (->> (str/split (str ring-core-version) #"\.")
(take 2) ;; keep major and minor versions
(map #(Integer/parseInt %)))]
(when (or (> x 1) ;; major version is greater than 1
(and (= x 1) (> y 14))) ;; major version is 1 and minor version is greater than 14
(main/abort (format "ring-core version %s is not supported. Must be 1.14.x until performance regression is fixed (#197)." ring-core-version)))))

(fail-if-ring-core->1-14! ring-core-version)

;; If you modify the version manually, run scripts/sync_ezbake_dep.rb to keep
;; the ezbake dependency in sync.
Expand All @@ -58,17 +26,18 @@
:license {:name "Apache License, Version 2.0"
:url "http://www.apache.org/licenses/LICENSE-2.0.html"}

:min-lein-version "2.9.1"
:min-lein-version "2.12.0"

;; Generally, try to keep version pins in :managed-dependencies and the libraries
;; this project actually uses in :dependencies, inheriting the version from
;; :managed-dependencies. This prevents endless version conflicts due to deps of deps.
;; Renovate should keep the versions largely in sync between projects.
:managed-dependencies [[org.clojure/clojure "1.12.4"]
[org.clojure/tools.namespace "0.3.1"]
:managed-dependencies [[org.clojure/clojure "1.12.5"]
[org.clojure/tools.namespace "1.5.1"]
[org.clojure/tools.reader "1.6.0"]
[beckon "0.1.1"]
[ch.qos.logback/logback-access ~logback-version]
[ch.qos.logback.access/logback-access-common "2.0.12"]
[ch.qos.logback.access/logback-access-jetty12 "2.0.12"]
[ch.qos.logback/logback-classic ~logback-version]
[ch.qos.logback/logback-core ~logback-version]
[cheshire "6.2.0"]
Expand All @@ -85,35 +54,35 @@
[io.dropwizard.metrics/metrics-core "3.2.6"]
[lambdaisland/uri "1.19.155"]
[liberator "0.15.3"]
[net.logstash.logback/logstash-logback-encoder "7.4"]
[net.logstash.logback/logstash-logback-encoder "9.0"]
[org.apache.commons/commons-exec "1.6.0"]
[org.bouncycastle/bcpkix-jdk18on "1.84"]
[org.bouncycastle/bcpkix-fips "1.0.8"]
[org.bouncycastle/bc-fips "1.0.2.6"]
[org.bouncycastle/bctls-fips "1.0.19"]
[org.openvoxproject/clj-shell-utils "2.1.2"]
[org.openvoxproject/clj-shell-utils "2.2.0"]
[org.openvoxproject/comidi "1.1.3"]
[org.openvoxproject/http-client "2.3.0"]
[org.openvoxproject/i18n ~i18n-version]
[org.openvoxproject/jruby-utils "5.3.8"]
[org.openvoxproject/jruby-utils "5.4.0"]
[org.openvoxproject/kitchensink "3.5.7"]
[org.openvoxproject/kitchensink "3.5.7" :classifier "test"]
[org.openvoxproject/rbac-client "1.3.0"]
[org.openvoxproject/rbac-client "1.3.0" :classifier "test"]
[org.openvoxproject/ring-middleware "2.2.0"]
[org.openvoxproject/ssl-utils "3.6.4"]
[org.openvoxproject/trapperkeeper "4.3.5"]
[org.openvoxproject/trapperkeeper "4.3.5" :classifier "test"]
[org.openvoxproject/trapperkeeper "5.0.0"]
[org.openvoxproject/trapperkeeper "5.0.0" :classifier "test"]
[org.openvoxproject/trapperkeeper-comidi-metrics "1.1.0"]
[org.openvoxproject/trapperkeeper-authorization "2.2.0"]
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.5.2"]
[org.openvoxproject/trapperkeeper-metrics "2.2.0"]
[org.openvoxproject/trapperkeeper-metrics "2.2.0" :classifier "test"]
[org.openvoxproject/trapperkeeper-scheduler "1.3.2"]
[org.openvoxproject/trapperkeeper-status "1.4.0"]
[org.openvoxproject/trapperkeeper-webserver "10.0.0"]
[org.openvoxproject/trapperkeeper-webserver "10.0.0" :classifier "test"]
[org.ow2.asm/asm "9.9.1"]
[org.openvoxproject/trapperkeeper-authorization "2.3.0"]
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.6.0"]
[org.openvoxproject/trapperkeeper-metrics "2.3.0"]
[org.openvoxproject/trapperkeeper-metrics "2.3.0" :classifier "test"]
[org.openvoxproject/trapperkeeper-scheduler "1.4.0"]
[org.openvoxproject/trapperkeeper-status "1.5.0"]
[org.openvoxproject/trapperkeeper-webserver "12.0.2"]
[org.openvoxproject/trapperkeeper-webserver "12.0.2" :classifier "test"]
[org.ow2.asm/asm "9.10"]
[org.slf4j/jul-to-slf4j ~slf4j-version]
[org.slf4j/log4j-over-slf4j ~slf4j-version]
[org.slf4j/slf4j-api ~slf4j-version]
Expand All @@ -122,7 +91,7 @@
[prismatic/schema "1.4.1"]
[ring-basic-authentication "1.2.0"]
[ring/ring-codec "1.3.0"]
[ring/ring-core ~ring-core-version]
[ring/ring-core "1.15.4"]
[ring/ring-mock "0.6.2"]
[slingshot "0.12.2"]]

Expand Down Expand Up @@ -280,7 +249,7 @@
[org.openvoxproject/puppetserver "8.14.0-SNAPSHOT"]
[org.openvoxproject/trapperkeeper-webserver]
[org.openvoxproject/trapperkeeper-metrics]]
:plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.5")]]
:plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.7")]]
:name "puppetserver"}

:ezbake-fips {:dependencies ^:replace [[org.clojure/clojure]
Expand All @@ -294,7 +263,7 @@
[org.openvoxproject/trapperkeeper-webserver]
[org.openvoxproject/trapperkeeper-metrics]]
:uberjar-exclusions [#"^org/bouncycastle/.*"]
:plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.5")]]
:plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.7")]]
:name "puppetserver"}
:uberjar {:dependencies [[org.openvoxproject/trapperkeeper-webserver]]
:aot [puppetlabs.trapperkeeper.main
Expand Down
2 changes: 1 addition & 1 deletion tasks/build.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ namespace :vox do

puts "Building openvox-server"
ezbake_version_var = ENV['EZBAKE_VERSION'] ? "EZBAKE_VERSION=#{ENV['EZBAKE_VERSION']}" : ''
run("cd /code && rm -rf output && bundle install --without test && lein install")
run("cd /code && rm -rf output && bundle config set without test && bundle install && lein install")

unless @debs.empty? && @nonfips_rpms.empty?
run("cd /code && COW=\"#{@debs}\" MOCK=\"#{@nonfips_rpms}\" GEM_SOURCE='https://rubygems.org' #{ezbake_version_var} EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS=true EZBAKE_NODEPLOY=true LEIN_PROFILES=ezbake lein with-profile user,ezbake,provided ezbake local-build")
Expand Down
Loading