Skip to content

Commit 2263149

Browse files
solrbotjanhoy
andauthored
Update all non-major dependencies (branch_9x) (#4586)
Co-authored-by: Jan Høydahl <jan.git@cominvent.com>
1 parent e89c166 commit 2263149

5 files changed

Lines changed: 32 additions & 4 deletions

File tree

.github/renovate.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,33 @@
99
"fileFilters": ["solr/licenses/*.sha1"],
1010
"executionMode": "branch"
1111
},
12+
"packageRules": [
13+
{
14+
"description": "Pin com.palantir.consistent-versions to 2.32.0; newer versions require Java 17 but branch_9x builds with Java 11",
15+
"matchPackageNames": ["com.palantir.consistent-versions"],
16+
"allowedVersions": "2.32.0"
17+
},
18+
{
19+
"description": "Pin org.carrot2:carrot2-core to 4.5.1; 4.8.6 requires Java 21 but branch_9x builds with Java 11",
20+
"matchPackageNames": ["org.carrot2:carrot2-core"],
21+
"allowedVersions": "4.5.1"
22+
},
23+
{
24+
"description": "Keep org.apache.hadoop on 3.4.x; 3.5.0 requires Java 17 but branch_9x builds with Java 11",
25+
"matchPackagePrefixes": ["org.apache.hadoop:"],
26+
"allowedVersions": "<3.5.0"
27+
},
28+
{
29+
"description": "Pin dev.langchain4j to 0.35.0; 0.36.2 requires Java 17 but branch_9x builds with Java 11",
30+
"matchPackagePrefixes": ["dev.langchain4j:"],
31+
"allowedVersions": "0.35.0"
32+
},
33+
{
34+
"description": "Keep Error Prone on 2.31.0; the build hard-pins it to 2.31.0 for JDK11 compatibility on branch_9x",
35+
"matchPackagePrefixes": ["com.google.errorprone:"],
36+
"allowedVersions": "2.31.0"
37+
}
38+
],
1239
"schedule": ["* * * * *"],
1340
"prConcurrentLimit": 100,
1441
"prHourlyLimit": 10,

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.time.format.DateTimeFormatter
2121
plugins {
2222
id 'base'
2323
id 'com.palantir.consistent-versions' version '2.32.0'
24-
id 'org.owasp.dependencycheck' version '12.1.3'
24+
id 'org.owasp.dependencycheck' version '12.2.2'
2525
id 'ca.cutterslade.analyze' version '1.10.0'
2626
id 'de.thetaphi.forbiddenapis' version '3.10' apply false
2727
id 'de.undercouch.download' version '5.7.0' apply false

gradle/validation/owasp-dependency-check.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ configure(rootProject) {
2828
formats = ['ALL']
2929
skipProjects = [':solr:solr-ref-guide', ':solr-missing-doclet']
3030
skipConfigurations = ['unifiedClasspath', 'permitUnusedDeclared']
31-
suppressionFile = file("${resources}/exclusions.xml")
31+
suppressionFile = "${resources}/exclusions.xml"
3232
analyzers {
3333
assemblyEnabled = false
3434
}

versions.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ com.fasterxml.jackson.module:jackson-module-scala_2.13:2.22.0 (2 constraints: e7
1919
com.fasterxml.woodstox:woodstox-core:7.2.0 (3 constraints: 6235ec97)
2020
com.github.ben-manes.caffeine:caffeine:3.2.4 (2 constraints: 0e123b17)
2121
com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236)
22-
com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36)
22+
com.github.spotbugs:spotbugs-annotations:4.10.2 (1 constraints: 39053d3b)
2323
com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87)
2424
com.github.virtuald:curvesapi:1.08 (1 constraints: 9f0ac8c0)
2525
com.google.android:annotations:4.1.1.4 (4 constraints: a33b86f4)
@@ -322,6 +322,7 @@ org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 929b3d90)
322322
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21)
323323
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (6 constraints: 745eefc1)
324324
org.jspecify:jspecify:1.0.0 (8 constraints: 577d1349)
325+
org.junit:junit-bom:6.1.0 (1 constraints: c0115ade)
325326
org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
326327
org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
327328
org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c)

versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ com.carrotsearch:hppc=0.10.0
88
com.cybozu.labs:langdetect=1.1-20120112
99
com.fasterxml.jackson:jackson-bom=2.22.0
1010
com.github.ben-manes.caffeine:caffeine=3.2.4
11-
com.github.spotbugs:*=4.8.6
11+
com.github.spotbugs:*=4.10.2
1212
com.github.stephenc.jcip:jcip-annotations=1.0-1
1313
com.google.cloud:google-cloud-bom=0.265.0
1414
com.google.errorprone:*=2.31.0

0 commit comments

Comments
 (0)