This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 5b4b21620c1 SOLR-17892: Fix cuVS checksum issue (#3825)
5b4b21620c1 is described below
commit 5b4b21620c12a57f96c9d5e9ed6e0c6ef7a9991d
Author: Ishan Chattopadhyaya <[email protected]>
AuthorDate: Sat Nov 1 13:52:43 2025 +0530
SOLR-17892: Fix cuVS checksum issue (#3825)
---
gradle/globals.gradle | 4 ++++
solr/licenses/cuvs-java-25.10.0.jar.sha1 | 2 +-
solr/licenses/cuvs-lucene-25.10.0.jar.sha1 | 2 +-
solr/modules/cuvs/build.gradle | 8 +++++++-
solr/modules/cuvs/gradle.lockfile | 6 +++---
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gradle/globals.gradle b/gradle/globals.gradle
index 4834c5a4cce..83ed4ea7925 100644
--- a/gradle/globals.gradle
+++ b/gradle/globals.gradle
@@ -29,6 +29,10 @@ allprojects {
maven {
name "SearchScale"
url "https://maven.searchscale.com/snapshots";
+ content {
+ // Only look for cuvs-lucene in SearchScale repo (not yet on Maven
Central)
+ includeGroup "com.nvidia.cuvs.lucene"
+ }
}
/* Reenable this if we need it again in future
maven {
diff --git a/solr/licenses/cuvs-java-25.10.0.jar.sha1
b/solr/licenses/cuvs-java-25.10.0.jar.sha1
index e69a7cc14c3..d2d01cc2ca7 100644
--- a/solr/licenses/cuvs-java-25.10.0.jar.sha1
+++ b/solr/licenses/cuvs-java-25.10.0.jar.sha1
@@ -1 +1 @@
-6c22acfbdbc7f3a4a78a2edea46124df872e9ea5
+885ad074984741128c7cc723851e790711f91a6e
diff --git a/solr/licenses/cuvs-lucene-25.10.0.jar.sha1
b/solr/licenses/cuvs-lucene-25.10.0.jar.sha1
index 21e8aa8806b..60bd5f8e97d 100644
--- a/solr/licenses/cuvs-lucene-25.10.0.jar.sha1
+++ b/solr/licenses/cuvs-lucene-25.10.0.jar.sha1
@@ -1 +1 @@
-28c49fd9f03aa25dccc75da517247c9bc46e64b8
+735cac75bcf3b55763941cfd1e473dfcf47fbf97
diff --git a/solr/modules/cuvs/build.gradle b/solr/modules/cuvs/build.gradle
index d00eed9b1a3..218688cdab1 100644
--- a/solr/modules/cuvs/build.gradle
+++ b/solr/modules/cuvs/build.gradle
@@ -20,15 +20,21 @@ apply plugin: 'java-library'
description = 'cuVS plugin'
dependencies {
- implementation libs.cuvs.lucene
+ implementation(libs.cuvs.lucene) {
+ changing = true
+ }
implementation project(':solr:core')
implementation project(':solr:solrj')
implementation libs.apache.lucene.core
+ implementation libs.apache.lucene.backward.codecs
implementation libs.slf4j.api
testImplementation project(':solr:test-framework')
testImplementation libs.apache.lucene.testframework
testImplementation libs.junit.junit
testImplementation libs.commonsio.commonsio
+
+ // lucene-backward-codecs is a transitive dependency from cuvs-lucene but
required in lockfile
+ permitUnusedDeclared libs.apache.lucene.backward.codecs
}
diff --git a/solr/modules/cuvs/gradle.lockfile
b/solr/modules/cuvs/gradle.lockfile
index 50bfde70279..54a1741381c 100644
--- a/solr/modules/cuvs/gradle.lockfile
+++ b/solr/modules/cuvs/gradle.lockfile
@@ -97,10 +97,10 @@
org.apache.lucene:lucene-analysis-common:10.3.1=compileClasspath,jarValidation,r
org.apache.lucene:lucene-analysis-kuromoji:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-analysis-nori:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-analysis-phonetic:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.apache.lucene:lucene-backward-codecs:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.apache.lucene:lucene-backward-codecs:10.3.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.lucene:lucene-classification:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-codecs:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.apache.lucene:lucene-core:10.3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.apache.lucene:lucene-core:10.3.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.lucene:lucene-expressions:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-facet:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-grouping:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -167,4 +167,4 @@
org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrP
org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures
+empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures
