Skip to content

Commit 5b4b216

Browse files
authored
SOLR-17892: Fix cuVS checksum issue (#3825)
1 parent 0bcbe0b commit 5b4b216

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

gradle/globals.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ allprojects {
2929
maven {
3030
name "SearchScale"
3131
url "https://maven.searchscale.com/snapshots"
32+
content {
33+
// Only look for cuvs-lucene in SearchScale repo (not yet on Maven Central)
34+
includeGroup "com.nvidia.cuvs.lucene"
35+
}
3236
}
3337
/* Reenable this if we need it again in future
3438
maven {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6c22acfbdbc7f3a4a78a2edea46124df872e9ea5
1+
885ad074984741128c7cc723851e790711f91a6e
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
28c49fd9f03aa25dccc75da517247c9bc46e64b8
1+
735cac75bcf3b55763941cfd1e473dfcf47fbf97

solr/modules/cuvs/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,21 @@ apply plugin: 'java-library'
2020
description = 'cuVS plugin'
2121

2222
dependencies {
23-
implementation libs.cuvs.lucene
23+
implementation(libs.cuvs.lucene) {
24+
changing = true
25+
}
2426
implementation project(':solr:core')
2527
implementation project(':solr:solrj')
2628
implementation libs.apache.lucene.core
29+
implementation libs.apache.lucene.backward.codecs
2730
implementation libs.slf4j.api
2831

2932
testImplementation project(':solr:test-framework')
3033
testImplementation libs.apache.lucene.testframework
3134
testImplementation libs.junit.junit
3235
testImplementation libs.commonsio.commonsio
36+
37+
// lucene-backward-codecs is a transitive dependency from cuvs-lucene but required in lockfile
38+
permitUnusedDeclared libs.apache.lucene.backward.codecs
3339
}
3440

solr/modules/cuvs/gradle.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ org.apache.lucene:lucene-analysis-common:10.3.1=compileClasspath,jarValidation,r
9797
org.apache.lucene:lucene-analysis-kuromoji:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
9898
org.apache.lucene:lucene-analysis-nori:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
9999
org.apache.lucene:lucene-analysis-phonetic:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
100-
org.apache.lucene:lucene-backward-codecs:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
100+
org.apache.lucene:lucene-backward-codecs:10.3.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
101101
org.apache.lucene:lucene-classification:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
102102
org.apache.lucene:lucene-codecs:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
103-
org.apache.lucene:lucene-core:10.3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
103+
org.apache.lucene:lucene-core:10.3.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
104104
org.apache.lucene:lucene-expressions:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
105105
org.apache.lucene:lucene-facet:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
106106
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
167167
org.slf4j:jul-to-slf4j:2.0.17=solrPlatformLibs
168168
org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
169169
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
170-
empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures
170+
empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures

0 commit comments

Comments
 (0)