From 3a7f987914bb8ce097698e07ea4f6f390e18476c Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 5 Aug 2024 10:02:19 +0200 Subject: [PATCH 1/3] HSEARCH-5210 Upgrade to Lucene 9.12 --- build/parents/build/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml index ea35c143cdf..52b606053c6 100644 --- a/build/parents/build/pom.xml +++ b/build/parents/build/pom.xml @@ -37,7 +37,7 @@ Also make sure to update Javadocs for RewriteMethod. --> - 9.11.1 + 9.12.0 ${parsed-version.org.apache.lucene.majorVersion}_${parsed-version.org.apache.lucene.minorVersion}_${parsed-version.org.apache.lucene.incrementalVersion} https://lucene.apache.org/core/${javadoc.org.apache.lucene.tag}/core/ https://lucene.apache.org/core/${javadoc.org.apache.lucene.tag}/analysis/common/ From ec8a0d37159091e9d7195d8c3600ba52d9730882 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 5 Aug 2024 09:58:03 +0200 Subject: [PATCH 2/3] HSEARCH-5210 Update to 9.12 Lucene codec --- .../lowlevel/codec/impl/HibernateSearchLuceneCodec.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/codec/impl/HibernateSearchLuceneCodec.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/codec/impl/HibernateSearchLuceneCodec.java index 4aa4d8e5244..026bb4c04c1 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/codec/impl/HibernateSearchLuceneCodec.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/codec/impl/HibernateSearchLuceneCodec.java @@ -13,12 +13,12 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.codecs.lucene99.Lucene99Codec; +import org.apache.lucene.codecs.lucene912.Lucene912Codec; import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat; public class HibernateSearchLuceneCodec extends FilterCodec { - public static final Codec DEFAULT_CODEC = new Lucene99Codec(); + public static final Codec DEFAULT_CODEC = new Lucene912Codec(); private final KnnVectorsFormat knnVectorsFormat; From af470571295bbefc4ed7bc9bb4d45cc15d0b8253 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 30 Sep 2024 12:24:50 +0200 Subject: [PATCH 3/3] HSEARCH-5210 Update ci update jobs to address Lucene 9.12 upgrade --- ci/dependency-update/Jenkinsfile | 11 +++++------ .../{rules-lucene9.11.xml => rules-lucene9.12.xml} | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) rename ci/dependency-update/{rules-lucene9.11.xml => rules-lucene9.12.xml} (90%) 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\.).*