From a6e63f03d403d9c1e9afe660e94ca1594a118c65 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 16:17:59 -0800 Subject: [PATCH 01/11] Remove Perforce artifacts --- CODEOWNERS | 4 ---- CONTRIBUTING.md | 46 ---------------------------------------------- 2 files changed, 50 deletions(-) delete mode 100644 CODEOWNERS delete mode 100644 CONTRIBUTING.md diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index 093fef15..00000000 --- a/CODEOWNERS +++ /dev/null @@ -1,4 +0,0 @@ -# This will cause the puppetserver-maintainers group to be assigned -# review of any opened PRs against the branches containing this file. - -* @puppetlabs/dumpling @puppetlabs/skeletor diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 4c3e3c82..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,46 +0,0 @@ -# How to contribute - -* Make sure you have a [GitHub account](https://github.com/signup/free) -* Fork the repository on GitHub - -## Making Changes - -* Create a topic branch from where you want to base your work (this is almost -definitely the master branch). - * To quickly create a topic branch based on master; `git branch - fix/master/my_contribution master` then checkout the new branch with `git - checkout fix/master/my_contribution`. - * Please avoid working directly on the - `master` branch. -* Make commits of logical units. -* Check for unnecessary whitespace with `git diff --check` before committing. -* Make sure your commit messages are in the proper format. - -```` - Make the example in CONTRIBUTING imperative and concrete - - Without this patch applied the example commit message in the CONTRIBUTING - document is not a concrete example. This is a problem because the - contributor is left to imagine what the commit message should look like - based on a description rather than an example. This patch fixes the - problem by making the example concrete and imperative. - - The first line is a real life imperative statement. The body describes - the behavior without the patch, why this is a problem, and how the patch - fixes the problem when applied. -```` - -* Make sure you have added the necessary tests for your changes. -* Run _all_ the tests to assure nothing else was accidentally broken. - -## Submitting Changes - -* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla). -* Push your changes to a topic branch in your fork of the repository. -* Submit a pull request to the repository in the puppetlabs organization. - -# Additional Resources - -* [Contributor License Agreement](http://links.puppetlabs.com/cla) -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) From 2237a34a278ce766869a1e65ce2e7790d0e7434a Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 16:18:15 -0800 Subject: [PATCH 02/11] Add workflows and renovate config --- .github/dependabot.yml | 8 +++++++ .github/release.yml | 39 ++++++++++++++++++++++++++++++++ .github/workflows/lein-test.yaml | 1 - .github/workflows/release.yaml | 15 ++++++++++++ 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 .github/release.yml create mode 100644 .github/workflows/release.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 95eae7f5..0aab5f12 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,13 @@ version: 2 updates: + # raise PRs for gem updates + - package-ecosystem: bundler + directory: "/" + schedule: + interval: daily + time: "13:00" + open-pull-requests-limit: 10 + # Maintain dependencies for GitHub Actions - package-ecosystem: github-actions directory: "/" diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000..cca537e5 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,39 @@ +--- +# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes + +changelog: + exclude: + labels: + - duplicate + - invalid + - modulesync + - question + - skip-changelog + - wont-fix + - wontfix + + categories: + - title: Breaking Changes 🛠 + labels: + - backwards-incompatible + + - title: New Features 🎉 + labels: + - enhancement + + - title: Bug Fixes 🐛 + labels: + - bug + + - title: Documentation Updates 📚 + labels: + - documentation + - docs + + - title: Dependency Updates ⬆️ + labels: + - dependencies + + - title: Other Changes + labels: + - "*" diff --git a/.github/workflows/lein-test.yaml b/.github/workflows/lein-test.yaml index 8f2530f8..e22a3350 100644 --- a/.github/workflows/lein-test.yaml +++ b/.github/workflows/lein-test.yaml @@ -20,7 +20,6 @@ jobs: java: - '21' - '17' - - '11' steps: - name: Check out repository code uses: actions/checkout@v6 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..78e5808a --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,15 @@ +--- +name: Publish package to GitHub Packages and clojars.org + +permissions: + contents: read + +on: + workflow_dispatch: + +jobs: + 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 a5e831fbf55cc7774329d438e72d1d9530c328fd Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 16:19:12 -0800 Subject: [PATCH 03/11] Update README.md --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 2c68d5dd..54fa5408 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ A library for creating and interacting with a pool of JRuby instances in Clojure. -[![Build Status](https://travis-ci.org/puppetlabs/jruby-utils.svg)](https://travis-ci.org/puppetlabs/jruby-utils) - ## Usage This is a brief overview of the functionality of this library; TODO add more docs. @@ -51,6 +49,4 @@ See [LICENSE](LICENSE). ## Support -We use the [Trapperkeeper project on -JIRA](https://tickets.puppetlabs.com/browse/TK) for tickets on this project, -although Github issues are welcome too. +GitHub issues and PRs are welcome! Additionally, drop us a line in [the Vox Pupuli Slack](https://voxpupuli.slack.com). From 38ed8117ed6d88f730ff71203408ea2f0e824c26 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 16:20:37 -0800 Subject: [PATCH 04/11] Updates for OpenVox --- project.clj | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/project.clj b/project.clj index 616aa382..83260d47 100644 --- a/project.clj +++ b/project.clj @@ -1,11 +1,11 @@ -(defproject puppetlabs/jruby-utils "5.2.1-SNAPSHOT" +(defproject org.openvoxproject/jruby-utils "5.2.1-SNAPSHOT" :description "A library for working with JRuby" - :url "https://github.com/puppetlabs/jruby-utils" + :url "https://github.com/openvoxproject/jruby-utils" :license {:name "Apache License, Version 2.0" :url "http://www.apache.org/licenses/LICENSE-2.0"} :min-lein-version "2.9.1" - :parent-project {:coords [puppetlabs/clj-parent "7.2.3"] + :parent-project {:coords [org.openvoxproject/clj-parent "7.4.1-SNAPSHOT"] :inherit [:managed-dependencies]} :pedantic? :abort @@ -22,12 +22,12 @@ [prismatic/schema] [slingshot] - [puppetlabs/jruby-deps "9.4.8.0-1"] + [org.openvoxproject/jruby-deps "9.4.8.0-2-SNAPSHOT"] - [puppetlabs/i18n] - [puppetlabs/kitchensink] - [puppetlabs/trapperkeeper] - [puppetlabs/ring-middleware]] + [org.openvoxproject/i18n] + [org.openvoxproject/kitchensink] + [org.openvoxproject/trapperkeeper] + [org.openvoxproject/ring-middleware]] :deploy-repositories [["releases" {:url "https://clojars.org/repo" :username :env/clojars_jenkins_username @@ -40,8 +40,8 @@ ;; code that we have. :classifiers [["test" :testutils]] - :profiles {:dev {:dependencies [[puppetlabs/kitchensink :classifier "test" :scope "test"] - [puppetlabs/trapperkeeper :classifier "test" :scope "test"] + :profiles {:dev {:dependencies [[org.openvoxproject/kitchensink :classifier "test" :scope "test"] + [org.openvoxproject/trapperkeeper :classifier "test" :scope "test"] [org.bouncycastle/bcpkix-jdk18on] [org.tcrawley/dynapath]] :jvm-opts ~(let [version (System/getProperty "java.specification.version") @@ -51,10 +51,10 @@ "-XX:+UseG1GC" "-Xms1G" "-Xmx2G"] - (if (= 17 (java.lang.Integer/parseInt major)) + (if (>= 17 (java.lang.Integer/parseInt major)) ["--add-opens" "java.base/sun.nio.ch=ALL-UNNAMED" "--add-opens" "java.base/java.io=ALL-UNNAMED"] [])))} :testutils {:source-paths ^:replace ["test/unit" "test/integration"]}} :plugins [[lein-parent "0.3.9"] - [puppetlabs/i18n "0.8.0" :hooks false]]) + [org.openvoxproject/i18n "0.8.0" :hooks false]]) From 43ce9c0a2dba5a5738ae723d553e41abc9052b99 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Fri, 19 Dec 2025 17:26:20 -0800 Subject: [PATCH 05/11] Update versions for testing purposes --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 83260d47..70c84ba6 100644 --- a/project.clj +++ b/project.clj @@ -57,4 +57,4 @@ :testutils {:source-paths ^:replace ["test/unit" "test/integration"]}} :plugins [[lein-parent "0.3.9"] - [org.openvoxproject/i18n "0.8.0" :hooks false]]) + [org.openvoxproject/i18n "0.9.3-SNAPSHOT" :hooks false]]) From eed5b627298a9cdfb330195bfe3ac0a7d4055ab0 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 30 Dec 2025 16:26:11 -0800 Subject: [PATCH 06/11] Update release workflow with secrets --- .github/workflows/release.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 78e5808a..66a1bed6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,8 +1,9 @@ --- -name: Publish package to GitHub Packages and clojars.org +name: Publish package to clojars.org permissions: - contents: read + contents: write + packages: write on: workflow_dispatch: @@ -13,3 +14,5 @@ jobs: secrets: github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }} ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }} + clojars_username: ${{ secrets.CLOJARS_USERNAME }} + clojars_password: ${{ secrets.CLOJARS_PASSWORD }} From eeb9198c1d0d8aae4cb7e64f9a9b88ca6b6eaecd Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 30 Dec 2025 17:47:49 -0800 Subject: [PATCH 07/11] Set versions to releases and update deploy repo --- project.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 70c84ba6..cac73754 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.apache.org/licenses/LICENSE-2.0"} :min-lein-version "2.9.1" - :parent-project {:coords [org.openvoxproject/clj-parent "7.4.1-SNAPSHOT"] + :parent-project {:coords [org.openvoxproject/clj-parent "7.5.0"] :inherit [:managed-dependencies]} :pedantic? :abort @@ -22,7 +22,7 @@ [prismatic/schema] [slingshot] - [org.openvoxproject/jruby-deps "9.4.8.0-2-SNAPSHOT"] + [org.openvoxproject/jruby-deps "9.4.8.0-2"] [org.openvoxproject/i18n] [org.openvoxproject/kitchensink] @@ -57,4 +57,4 @@ :testutils {:source-paths ^:replace ["test/unit" "test/integration"]}} :plugins [[lein-parent "0.3.9"] - [org.openvoxproject/i18n "0.9.3-SNAPSHOT" :hooks false]]) + [org.openvoxproject/i18n "0.9.3" :hooks false]]) From f8e27472c2b6e8a240662b128b70e34114c5ffea Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 30 Dec 2025 18:49:07 -0800 Subject: [PATCH 08/11] Update release workflow name again --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 66a1bed6..6ebeece3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,5 +1,5 @@ --- -name: Publish package to clojars.org +name: Release and publish package to clojars.org permissions: contents: write From 1a3bd4cdad52541b7833568f800d487cb480f34e Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 31 Dec 2025 13:45:58 -0800 Subject: [PATCH 09/11] Update Slack link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54fa5408..c0e65181 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,4 @@ See [LICENSE](LICENSE). ## Support -GitHub issues and PRs are welcome! Additionally, drop us a line in [the Vox Pupuli Slack](https://voxpupuli.slack.com). +GitHub issues and PRs are welcome! Additionally, drop us a line in [the Vox Pupuli Slack](https://voxpupuli.org/connect/). From e1e067dd102ffd2746cf7d00a3ad79c1f72f01c9 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 31 Dec 2025 13:46:08 -0800 Subject: [PATCH 10/11] Bump clj-parent and i18n --- project.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index cac73754..e3fe215c 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.apache.org/licenses/LICENSE-2.0"} :min-lein-version "2.9.1" - :parent-project {:coords [org.openvoxproject/clj-parent "7.5.0"] + :parent-project {:coords [org.openvoxproject/clj-parent "7.5.1"] :inherit [:managed-dependencies]} :pedantic? :abort @@ -22,7 +22,7 @@ [prismatic/schema] [slingshot] - [org.openvoxproject/jruby-deps "9.4.8.0-2"] + [org.openvoxproject/jruby-deps "9.4.8.0-3"] [org.openvoxproject/i18n] [org.openvoxproject/kitchensink] @@ -57,4 +57,4 @@ :testutils {:source-paths ^:replace ["test/unit" "test/integration"]}} :plugins [[lein-parent "0.3.9"] - [org.openvoxproject/i18n "0.9.3" :hooks false]]) + [org.openvoxproject/i18n "0.9.4" :hooks false]]) From 9f1d551c31fafcf4c54ca058663f13715088858c Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Wed, 31 Dec 2025 13:49:38 -0800 Subject: [PATCH 11/11] Add ring/ring-core dependency --- project.clj | 1 + 1 file changed, 1 insertion(+) diff --git a/project.clj b/project.clj index e3fe215c..c909e577 100644 --- a/project.clj +++ b/project.clj @@ -21,6 +21,7 @@ [clj-commons/fs] [prismatic/schema] [slingshot] + [ring/ring-core] [org.openvoxproject/jruby-deps "9.4.8.0-3"]