diff --git a/ci/dependency-update/Jenkinsfile b/ci/dependency-update/Jenkinsfile index d5906bf15d3..a33295edb8b 100644 --- a/ci/dependency-update/Jenkinsfile +++ b/ci/dependency-update/Jenkinsfile @@ -23,14 +23,13 @@ Map settings() { // just rebuild all dependants since ORM7 upgrade will affect all mappers additionalMavenArgs: '-am' ] - case 'lucene9.11': + case 'lucene9.12': return [ updateProperties: ['version.org.apache.lucene'], onlyRunTestDependingOn: ['hibernate-search-backend-lucene'], additionalMavenArgs: '-Dtest.elasticsearch.skip=true', - // With Lucene adding 9.12 Snapshot the 11 branch seems stale, and we are not getting any updates, - // resulting in the update step failing. Let's allow the build continue, - // just in case there are any new snapshots for 9.11 branch: + // Usually the "current-version"snapshots get stale, + // but just in case there are any new snapshots for 9.12 branch: skipSourceModifiedCheck: true ] case 'lucene9': @@ -133,7 +132,7 @@ pipeline { parameters { // choice parameter doesn't have a default, but the first value should be treated as a default, if it wasn't specified manually. // Make sure tp update axis and settings() when adding new choice parameter. - choice(name: 'UPDATE_JOB', choices: ['all', 'orm6.6plus', 'orm7', 'lucene9.11','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next'], description: 'Select which update jobs to run. `All` will include all configured update jobs.') + choice(name: 'UPDATE_JOB', choices: ['all', 'orm6.6plus', 'orm7', 'lucene9.12','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next'], description: 'Select which update jobs to run. `All` will include all configured update jobs.') string(name: 'ORM_REPOSITORY', defaultValue: '', description: 'Git URL to Hibernate ORM repository. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_BRANCH. Provide an http repository URL rather than an ssh one.') string(name: 'ORM_BRANCH', defaultValue: '', description: 'Hibernate ORM branch to build from. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_REPOSITORY. Either a pull request ID or a branch name should be provided, but not both at the same time. Use branch if you want to build from a fork repository.') string(name: 'ORM_PULL_REQUEST_ID', defaultValue: '', description: 'Hibernate ORM pull request id to build from. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_REPOSITORY. Either a pull request ID or a branch name should be provided, but not both at the same time.') @@ -231,7 +230,7 @@ pipeline { name 'DEPENDENCY_UPDATE_NAME' // NOTE: Remember to update the settings() method above when changing this. // And also add a new choice parameter in the parameters {} section of the pipeline - values 'orm6.6plus', 'orm7', 'lucene9.11','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next' + values 'orm6.6plus', 'orm7', 'lucene9.12','lucene9', 'lucene10', 'elasticsearch-current', 'elasticsearch-next' } } stages { diff --git a/ci/dependency-update/rules-lucene9.11.xml b/ci/dependency-update/rules-lucene9.12.xml similarity index 90% rename from ci/dependency-update/rules-lucene9.11.xml rename to ci/dependency-update/rules-lucene9.12.xml index 809e1844f61..113453de781 100644 --- a/ci/dependency-update/rules-lucene9.11.xml +++ b/ci/dependency-update/rules-lucene9.12.xml @@ -4,6 +4,6 @@ - (?!9\.11\.).* + (?!9\.12\.).*