Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,12 @@
"prConcurrentLimit": 100,
"prHourlyLimit": 10,
"branchPrefix": "renovate-9x/",
"commitMessageSuffix": " (branch_9x)"
"commitMessageSuffix": " (branch_9x)",
"packageRules": [
{
"description": "Skip errorprone upgrades since newer versions require JDK17",
"matchPackagePrefixes": ["com.google.errorprone"],
"enabled": false
}
]
}
12 changes: 12 additions & 0 deletions gradle/validation/error-prone.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ if (skipReason) {
}
}

configurations.all {
resolutionStrategy {
eachDependency { details ->
if (details.requested.group == "com.google.errorprone" &&
(details.requested.name == "error_prone_core" || details.requested.name == "error_prone_annotations")) {
details.useVersion("2.31.0")
details.because("Lock Error Prone dependencies to 2.31.0 to prevent accidental upgrades")
}
}
}
}

allprojects { prj ->
plugins.withType(JavaPlugin) {
// LUCENE-9650: Errorprone on master/gradle does not work when running as plugin
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/caffeine-3.1.8.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/caffeine-3.2.2.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8b0a31cb57ac00e18161d5586759912bd2637398
1 change: 1 addition & 0 deletions solr/licenses/jspecify-1.0.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7425a601c1c7ec76645a78d22b8c6a627edee507
2 changes: 1 addition & 1 deletion solr/modules/hdfs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.dropwizard.metrics:metrics-core'
// Caffeine cache to implement HDFS block caching
implementation 'com.github.ben-manes.caffeine:caffeine'
implementation('com.github.ben-manes.caffeine:caffeine') { transitive = false }

implementation 'commons-cli:commons-cli'

Expand Down
7 changes: 4 additions & 3 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0 (6 constraints: e358
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.0 (2 constraints: ac2419e1)
com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a)
com.fasterxml.woodstox:woodstox-core:7.0.0 (2 constraints: 9b23d883)
com.github.ben-manes.caffeine:caffeine:3.1.8 (2 constraints: 1112b117)
com.github.ben-manes.caffeine:caffeine:3.2.2 (2 constraints: 0c12eb16)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
com.github.junrar:junrar:7.5.3 (1 constraints: 660c1102)
com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236)
Expand Down Expand Up @@ -46,7 +46,7 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626)
com.google.code.gson:gson:2.11.0 (8 constraints: 566fc864)
com.google.errorprone:error_prone_annotations:2.31.0 (15 constraints: a5c51259)
com.google.errorprone:error_prone_annotations:2.31.0 (15 constraints: a5c51659)
com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37)
com.google.guava:guava:33.1.0-jre (26 constraints: 0280374a)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
Expand Down Expand Up @@ -319,7 +319,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
org.checkerframework:checker-qual:3.44.0 (5 constraints: 6c46e5ef)
org.checkerframework:checker-qual:3.44.0 (4 constraints: 3a36c0ef)
org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319)
org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a)
org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 38155daf)
Expand Down Expand Up @@ -376,6 +376,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.9.10 (4 constraints: 5c405537)
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 (3 constraints: 3a2c8a72)
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2)
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 49773549)
org.jspecify:jspecify:1.0.0 (1 constraints: f70f549f)
org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)
Expand Down
3 changes: 2 additions & 1 deletion versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ com.carrotsearch.randomizedtesting:*=2.8.3
com.carrotsearch:hppc=0.10.0
com.cybozu.labs:langdetect=1.1-20120112
com.fasterxml.jackson:jackson-bom=2.18.0
com.github.ben-manes.caffeine:caffeine=3.1.8
com.github.ben-manes.caffeine:caffeine=3.2.2
com.github.spotbugs:*=4.8.6
com.github.stephenc.jcip:jcip-annotations=1.0-1
com.google.cloud:google-cloud-bom=0.224.0
# Errorprone must stay on 2.31.0 on 9.x to play nice with JDK11
com.google.errorprone:*=2.31.0
com.google.guava:guava=32.1.3-jre
com.google.protobuf:*=3.25.8
Expand Down
Loading