Skip to content

Commit 7317009

Browse files
solrbotmalliaridis
andauthored
Update fasterxml (#3227)
* Update fasterxml * Fix version mismatch for jackson core annotations * Fix version drift in lockfiles * Add fasterxml BOM as platform dependency to remove dependency versions in version catalog * Update expected bytes length in test --------- Co-authored-by: Christos Malliaridis <[email protected]>
1 parent b69f698 commit 7317009

File tree

64 files changed

+241
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+241
-278
lines changed

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ eclipse-jettytoolchain = "5.0.2"
8585
# @keep jgit version used by git-status.gradle
8686
eclipse-jgit = "7.3.0.202506031305-r"
8787
essenty = "2.5.0"
88-
fasterxml = "2.18.2"
88+
fasterxml = "2.20.0"
8989
fasterxml-woodstox = "7.0.0"
9090
# @keep Flexmark used in classpath
9191
flexmark = "0.64.8"
@@ -353,11 +353,11 @@ eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "ecl
353353
eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" }
354354
essenty-lifecycle = { module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty" }
355355
fasterxml-jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "fasterxml" }
356-
fasterxml-jackson-core-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "fasterxml" }
357-
fasterxml-jackson-core-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "fasterxml" }
358-
fasterxml-jackson-core-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "fasterxml" }
359-
fasterxml-jackson-dataformat-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version.ref = "fasterxml" }
360-
fasterxml-jackson-dataformat-smile = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile", version.ref = "fasterxml" }
356+
fasterxml-jackson-core-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations" }
357+
fasterxml-jackson-core-core = { module = "com.fasterxml.jackson.core:jackson-core" }
358+
fasterxml-jackson-core-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
359+
fasterxml-jackson-dataformat-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor" }
360+
fasterxml-jackson-dataformat-smile = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile" }
361361
fasterxml-woodstox-core = { module = "com.fasterxml.woodstox:woodstox-core", version.ref = "fasterxml-woodstox" }
362362
flexmark-extensions-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext-abbreviation", version.ref = "flexmark" }
363363
flexmark-extensions-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" }

solr/api/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ resolve {
6161

6262
dependencies {
6363
api platform(project(":platform"))
64+
swaggerDeps platform(project(":platform"))
65+
api platform(libs.fasterxml.jackson.bom)
66+
6467
runtimeOnly libs.slf4j.api
65-
68+
6669
implementation libs.jakarta.ws.rsapi
6770
api libs.fasterxml.jackson.core.annotations
6871
api libs.swagger3.annotations.jakarta

solr/api/gradle.lockfile

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,17 @@
33
# This file is expected to be part of source control.
44
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation,testCompileClasspath,testRuntimeClasspath
55
com.carrotsearch:hppc:0.10.0=jarValidation,testRuntimeClasspath
6-
com.fasterxml.jackson.core:jackson-annotations:2.16.2=swaggerDeps
7-
com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
8-
com.fasterxml.jackson.core:jackson-core:2.16.2=swaggerDeps
9-
com.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,swaggerBuild,testCompileClasspath,testRuntimeClasspath
10-
com.fasterxml.jackson.core:jackson-databind:2.16.2=swaggerDeps
11-
com.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,swaggerBuild,testCompileClasspath,testRuntimeClasspath
12-
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,testRuntimeClasspath
13-
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,testRuntimeClasspath
14-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.2=swaggerDeps
15-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2=swaggerBuild
16-
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.2=swaggerDeps
17-
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2=swaggerBuild
18-
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.18.2=swaggerBuild
19-
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.18.2=swaggerBuild
20-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.16.2=swaggerDeps
21-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.16.2=swaggerDeps
22-
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,swaggerBuild,testRuntimeClasspath
23-
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.16.2=swaggerDeps
24-
com.fasterxml.jackson:jackson-bom:2.16.2=swaggerDeps
25-
com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
6+
com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
7+
com.fasterxml.jackson.core:jackson-core:2.20.0=jarValidation,swaggerBuild,testCompileClasspath,testRuntimeClasspath
8+
com.fasterxml.jackson.core:jackson-databind:2.20.0=jarValidation,swaggerBuild,testCompileClasspath,testRuntimeClasspath
9+
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.20.0=jarValidation,testRuntimeClasspath
10+
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.20.0=jarValidation,testRuntimeClasspath
11+
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0=swaggerBuild
12+
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0=swaggerBuild
13+
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.20.0=swaggerBuild
14+
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.20.0=swaggerBuild
15+
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0=jarValidation,swaggerBuild,testRuntimeClasspath
16+
com.fasterxml.jackson:jackson-bom:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
2617
com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath
2718
com.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath
2819
com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
@@ -54,7 +45,7 @@ io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClass
5445
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
5546
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
5647
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath
57-
io.github.classgraph:classgraph:4.8.165=swaggerBuild,swaggerDeps
48+
io.github.classgraph:classgraph:4.8.165=swaggerBuild
5849
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
5950
io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
6051
io.netty:netty-buffer:4.2.4.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -75,31 +66,20 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRunt
7566
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath
7667
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath
7768
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
78-
io.swagger.core.v3:swagger-annotations:2.2.22=swaggerDeps
7969
io.swagger.core.v3:swagger-core-jakarta:2.2.22=swaggerBuild
80-
io.swagger.core.v3:swagger-core:2.2.22=swaggerDeps
8170
io.swagger.core.v3:swagger-integration-jakarta:2.2.22=swaggerBuild
82-
io.swagger.core.v3:swagger-integration:2.2.22=swaggerDeps
8371
io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22=swaggerBuild
84-
io.swagger.core.v3:swagger-jaxrs2:2.2.22=swaggerDeps
8572
io.swagger.core.v3:swagger-models-jakarta:2.2.22=swaggerBuild
86-
io.swagger.core.v3:swagger-models:2.2.22=swaggerDeps
87-
jakarta.activation:jakarta.activation-api:1.2.2=swaggerDeps
8873
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
8974
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
9075
jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
91-
jakarta.validation:jakarta.validation-api:2.0.2=swaggerDeps
9276
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,swaggerBuild,testRuntimeClasspath
9377
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
94-
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=swaggerDeps
9578
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild
9679
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
97-
javax.servlet:javax.servlet-api:3.1.0=swaggerDeps
98-
javax.ws.rs:javax.ws.rs-api:2.1=swaggerDeps
9980
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
10081
org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath
10182
org.apache.commons:commons-exec:1.5.0=jarValidation,testRuntimeClasspath
102-
org.apache.commons:commons-lang3:3.14.0=swaggerDeps
10383
org.apache.commons:commons-lang3:3.18.0=jarValidation,swaggerBuild,testRuntimeClasspath
10484
org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath
10585
org.apache.curator:curator-client:5.9.0=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -170,7 +150,7 @@ org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11=jarValidation,testRuntim
170150
org.glassfish.jersey.inject:jersey-hk2:3.1.11=jarValidation,testRuntimeClasspath
171151
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=jarValidation,testRuntimeClasspath
172152
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
173-
org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,swaggerDeps,testRuntimeClasspath
153+
org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,testRuntimeClasspath
174154
org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,swaggerBuild,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
175155
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
176156
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath
@@ -184,8 +164,6 @@ org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotatio
184164
org.semver4j:semver4j:6.0.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
185165
org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,testRuntimeClasspath
186166
org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
187-
org.slf4j:slf4j-api:2.0.9=swaggerDeps
188167
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,testRuntimeClasspath
189-
org.yaml:snakeyaml:2.2=swaggerDeps
190-
org.yaml:snakeyaml:2.3=swaggerBuild
191-
empty=apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures
168+
org.yaml:snakeyaml:2.4=swaggerBuild
169+
empty=apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures,swaggerDeps

solr/benchmark/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# This file is expected to be part of source control.
44
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
55
com.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,testRuntimeClasspath
6-
com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7-
com.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath
8-
com.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath
9-
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath
10-
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath
11-
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath
12-
com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6+
com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7+
com.fasterxml.jackson.core:jackson-core:2.20.0=jarValidation,runtimeClasspath,testRuntimeClasspath
8+
com.fasterxml.jackson.core:jackson-databind:2.20.0=jarValidation,runtimeClasspath,testRuntimeClasspath
9+
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.20.0=jarValidation,runtimeClasspath,testRuntimeClasspath
10+
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.20.0=jarValidation,runtimeClasspath,testRuntimeClasspath
11+
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0=jarValidation,runtimeClasspath,testRuntimeClasspath
12+
com.fasterxml.jackson:jackson-bom:2.20.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
1414
com.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
1515
com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor

solr/core/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ description = 'Apache Solr Core'
2121

2222
dependencies {
2323
api platform(project(":platform"))
24+
permitUnusedDeclared platform(project(":platform"))
2425
// Spotbugs Annotations are only needed for old findbugs
2526
// annotation usage like in Zookeeper during compilation time.
2627
// It is not included in the release so exclude from checks.

0 commit comments

Comments
 (0)