From e92ca33836cf9f8493a23594da4ff332ad7d5677 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:44:51 -0800 Subject: [PATCH 1/6] Update release workflow --- .github/workflows/release.yaml | 42 ++++++++-------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 19c41451..78e5808a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,39 +1,15 @@ --- name: Publish package to GitHub Packages and clojars.org +permissions: + contents: read + on: - push: - tags: - - '*' + workflow_dispatch: jobs: - publish: - runs-on: ubuntu-24.04 - permissions: - contents: write - packages: write - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-java@v5 - with: - java-version: '21' - distribution: temurin - - name: Install clojure tools - uses: DeLaGuardo/setup-clojure@13.4 - with: - lein: 'latest' - #- name: Publish package to GitHub - # run: lein deploy github - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # GITHUB_ACTOR: ${{ github.actor }} - - name: Publish to clojars.org - run: lein deploy clojars - env: - CLOJARS_USERNAME: ${{ secrets.CLOJARS_USERNAME }} - CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }} - - name: Create Release Page - shell: bash - env: - GH_TOKEN: ${{ github.token }} - run: gh release create --repo ${{ github.repository }} ${{ github.ref_name }} --generate-notes + release: + uses: 'openvoxproject/shared-actions/.github/workflows/clojure_release.yml@main' + secrets: + github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }} + ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }} From b300e370c786ef321df3454f030e2dfbde898a57 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:45:01 -0800 Subject: [PATCH 2/6] Remove Perforce artifacts --- CODEOWNERS | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index ea078618..00000000 --- a/CODEOWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# This repo is owned by the PE teams -* @puppetlabs/dumpling @puppetlabs/skeletor From 3396dd0088cdb79805c1708d9fa9de9edc9b1ba7 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:46:11 -0800 Subject: [PATCH 3/6] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6803563c..e53d826d 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,7 @@ To create a release of clj-parent, first determine the release version. The release should reflect the updated projects. For example, if a component is updated to a new feature (Y) release, clj-parent should get a new feature (Y) release. If releasing a new X or Y version, open a PR to update the -[SNAPSHOT release version](https://github.com/puppetlabs/clj-parent/blob/main/project.clj#L10) +[SNAPSHOT release version](https://github.com/OpenVoxProject/clj-parent/blob/main/project.clj#L10) to the next `x.y.0-SNAPSHOT` version. -Once merged, run [the release pipeline](https://cinext-jenkinsmaster-enterprise-prod-1.delivery.puppetlabs.net/job/enterprise_clj-parent_release-clj_main/) -with default parameters, which will handle the relevant updates to the -project.clj version for the release. +Once merged, run the release action, which will handle the relevant updates to the project.clj version for the release. From e80b3c2e05d0124be4aaefaee91966bbe67c482e Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:47:19 -0800 Subject: [PATCH 4/6] Update namespaces for OpenVox --- project.clj | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/project.clj b/project.clj index eeec579e..3a272964 100644 --- a/project.clj +++ b/project.clj @@ -105,32 +105,32 @@ [prismatic/schema "1.1.12"] [stylefruits/gniazdo "1.2.1"] - [puppetlabs/http-client "2.1.4"] - [puppetlabs/jdbc-util "1.4.3"] - [puppetlabs/typesafe-config "0.2.0"] - [puppetlabs/ssl-utils "3.5.2"] - [puppetlabs/kitchensink ~ks-version] - [puppetlabs/kitchensink ~ks-version :classifier "test"] + [org.openvoxproject/http-client "2.1.4"] + [org.openvoxproject/jdbc-util "1.4.3"] + [org.openvoxproject/typesafe-config "0.2.0"] + [org.openvoxproject/ssl-utils "3.5.2"] + [org.openvoxproject/kitchensink ~ks-version] + [org.openvoxproject/kitchensink ~ks-version :classifier "test"] [org.openvoxproject/trapperkeeper ~tk-version] [org.openvoxproject/trapperkeeper ~tk-version :classifier "test"] - [com.puppetlabs/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version] - [com.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"] - [puppetlabs/trapperkeeper-authorization "2.0.1"] - [puppetlabs/trapperkeeper-status "1.2.0"] - [puppetlabs/trapperkeeper-filesystem-watcher "1.2.6"] - [puppetlabs/structured-logging "0.2.0"] - [puppetlabs/ring-middleware "2.0.4"] - [puppetlabs/dujour-version-check "1.0.0"] - [puppetlabs/comidi "1.0.0"] - [puppetlabs/trapperkeeper-comidi-metrics "0.1.1"] - [puppetlabs/i18n "0.9.2"] - [puppetlabs/rbac-client ~rbac-client-version] - [puppetlabs/rbac-client ~rbac-client-version :classifier "test"] - [puppetlabs/clj-shell-utils "2.0.1"] - [puppetlabs/jruby-utils "5.2.0"] + [org.openvoxproject/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version] + [org.openvoxproject/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version :classifier "test"] + [org.openvoxproject/trapperkeeper-metrics ~tk-metrics-version] + [org.openvoxproject/trapperkeeper-metrics ~tk-metrics-version :classifier "test"] + [org.openvoxproject/trapperkeeper-scheduler "1.1.3"] + [org.openvoxproject/trapperkeeper-authorization "2.0.1"] + [org.openvoxproject/trapperkeeper-status "1.2.0"] + [org.openvoxproject/trapperkeeper-filesystem-watcher "1.2.6"] + [org.openvoxproject/structured-logging "0.2.0"] + [org.openvoxproject/ring-middleware "2.0.4"] + [org.openvoxproject/dujour-version-check "1.0.0"] + [org.openvoxproject/comidi "1.0.0"] + [org.openvoxproject/trapperkeeper-comidi-metrics "0.1.1"] + [org.openvoxproject/i18n "0.9.2"] + [org.openvoxproject/rbac-client ~rbac-client-version] + [org.openvoxproject/rbac-client ~rbac-client-version :classifier "test"] + [org.openvoxproject/clj-shell-utils "2.0.1"] + [org.openvoxproject/jruby-utils "5.2.0"] ;; When these versions change we need to also ;; promote the changes into the PE packaging repo From 03f42561405d20010fc040498a962bd603951fe6 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 17:17:54 -0800 Subject: [PATCH 5/6] Remove unused jdbc-util --- project.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/project.clj b/project.clj index 3a272964..3d990745 100644 --- a/project.clj +++ b/project.clj @@ -106,7 +106,6 @@ [stylefruits/gniazdo "1.2.1"] [org.openvoxproject/http-client "2.1.4"] - [org.openvoxproject/jdbc-util "1.4.3"] [org.openvoxproject/typesafe-config "0.2.0"] [org.openvoxproject/ssl-utils "3.5.2"] [org.openvoxproject/kitchensink ~ks-version] From eb0b2aadd248ddeb4aa5c27872710118d1064990 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 17:22:49 -0800 Subject: [PATCH 6/6] Update versions As of this merge, these versions are not yet released. But clj-parent needs to come first before we bump all the things so we pull in the right versions. --- project.clj | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/project.clj b/project.clj index 3d990745..b163e438 100644 --- a/project.clj +++ b/project.clj @@ -1,10 +1,10 @@ (def clj-version "1.11.2") -(def ks-version "3.4.0") -(def tk-version "4.1.0") -(def tk-jetty-10-version "1.0.18") -(def tk-metrics-version "2.0.4") +(def ks-version "3.4.2") +(def tk-version "4.1.1") +(def tk-jetty-10-version "1.0.19") +(def tk-metrics-version "2.0.5") (def logback-version "1.3.14") -(def rbac-client-version "1.1.5") +(def rbac-client-version "1.1.8") (def dropwizard-metrics-version "3.2.2") (defproject org.openvoxproject/clj-parent "7.4.1-SNAPSHOT" @@ -105,9 +105,9 @@ [prismatic/schema "1.1.12"] [stylefruits/gniazdo "1.2.1"] - [org.openvoxproject/http-client "2.1.4"] - [org.openvoxproject/typesafe-config "0.2.0"] - [org.openvoxproject/ssl-utils "3.5.2"] + [org.openvoxproject/http-client "2.1.5"] + [org.openvoxproject/typesafe-config "0.2.1"] + [org.openvoxproject/ssl-utils "3.5.4"] [org.openvoxproject/kitchensink ~ks-version] [org.openvoxproject/kitchensink ~ks-version :classifier "test"] [org.openvoxproject/trapperkeeper ~tk-version] @@ -116,20 +116,20 @@ [org.openvoxproject/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version :classifier "test"] [org.openvoxproject/trapperkeeper-metrics ~tk-metrics-version] [org.openvoxproject/trapperkeeper-metrics ~tk-metrics-version :classifier "test"] - [org.openvoxproject/trapperkeeper-scheduler "1.1.3"] - [org.openvoxproject/trapperkeeper-authorization "2.0.1"] - [org.openvoxproject/trapperkeeper-status "1.2.0"] - [org.openvoxproject/trapperkeeper-filesystem-watcher "1.2.6"] - [org.openvoxproject/structured-logging "0.2.0"] - [org.openvoxproject/ring-middleware "2.0.4"] - [org.openvoxproject/dujour-version-check "1.0.0"] - [org.openvoxproject/comidi "1.0.0"] - [org.openvoxproject/trapperkeeper-comidi-metrics "0.1.1"] - [org.openvoxproject/i18n "0.9.2"] + [org.openvoxproject/trapperkeeper-scheduler "1.2.4"] + [org.openvoxproject/trapperkeeper-authorization "2.0.2"] + [org.openvoxproject/trapperkeeper-status "1.2.1"] + [org.openvoxproject/trapperkeeper-filesystem-watcher "1.2.7"] + [org.openvoxproject/structured-logging "0.2.1"] + [org.openvoxproject/ring-middleware "2.0.5"] + [org.openvoxproject/dujour-version-check "1.0.1"] + [org.openvoxproject/comidi "1.0.1"] + [org.openvoxproject/trapperkeeper-comidi-metrics "0.1.3"] + [org.openvoxproject/i18n "0.9.3"] [org.openvoxproject/rbac-client ~rbac-client-version] [org.openvoxproject/rbac-client ~rbac-client-version :classifier "test"] - [org.openvoxproject/clj-shell-utils "2.0.1"] - [org.openvoxproject/jruby-utils "5.2.0"] + [org.openvoxproject/clj-shell-utils "2.0.2"] + [org.openvoxproject/jruby-utils "5.2.1"] ;; When these versions change we need to also ;; promote the changes into the PE packaging repo