diff --git a/project.clj b/project.clj index d1ff2454..7f2c89c1 100644 --- a/project.clj +++ b/project.clj @@ -1,6 +1,6 @@ (def i18n-version "1.0.4") -(defproject org.openvoxproject/jruby-utils "5.5.1-SNAPSHOT" +(defproject org.openvoxproject/jruby-utils "6.0.0-SNAPSHOT" :description "A library for working with JRuby" :url "https://github.com/openvoxproject/jruby-utils" :license {:name "Apache License, Version 2.0" diff --git a/renovate.jsonc b/renovate.jsonc index ad4c7e99..54f0c0df 100644 --- a/renovate.jsonc +++ b/renovate.jsonc @@ -1,5 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "baseBranchPatterns": ["main", "5.x"], "addLabels": ["renovate", "dependencies"], "assigneesFromCodeOwners": true, "automerge": true, @@ -10,11 +11,20 @@ "platformAutomerge": true, "packageRules": [ - // Lock jruby-deps to the 9.4 release series. Moving to 10.0 will - // be a major version change. + // Lock JRuby to the 10.0 release series for the main branch. + { + "groupName": "jruby updates", + "allowedVersions": "<10.1", + "matchPackageNames": [ + "org.openvoxproject:jruby-deps" + ] + }, + + // Lock JRuby to the 9.4 release series for the 5.x branch. { "groupName": "jruby updates", "allowedVersions": "<10.0", + "matchBaseBranches": "5.x", "matchPackageNames": [ "org.openvoxproject:jruby-deps" ]