diff --git a/changelog/unreleased/PR#4850-update-okhttp-okio.yml b/changelog/unreleased/PR#4850-update-okhttp-okio.yml new file mode 100644 index 000000000000..f37e14a49518 --- /dev/null +++ b/changelog/unreleased/PR#4850-update-okhttp-okio.yml @@ -0,0 +1,7 @@ +title: Update OkHttp & Okio +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4850 + url: https://github.com/apache/solr/pull/4850 diff --git a/changelog/unreleased/PR#4852-update-no-nav-security-mock-oauth2-server.yml b/changelog/unreleased/PR#4852-update-no-nav-security-mock-oauth2-server.yml new file mode 100644 index 000000000000..0da9e0399fcb --- /dev/null +++ b/changelog/unreleased/PR#4852-update-no-nav-security-mock-oauth2-server.yml @@ -0,0 +1,7 @@ +title: Update no.nav.security:mock-oauth2-server to v6 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4852 + url: https://github.com/apache/solr/pull/4852 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 27f3856e3ff8..5a2852c5505b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -164,7 +164,7 @@ material3 = "1.10.0-alpha05" mockito = "5.23.0" morethan-jmhreport = "0.9.6" mvikotlin = "4.4.0" -navsecurity = "5.0.2" +navsecurity = "6.0.2" netty = "4.2.17.Final" # @keep for version alignment netty-tcnative = "2.0.82.Final" @@ -192,14 +192,16 @@ semver4j = "6.0.0" slf4j = "2.0.18" spatial4j = "0.8" spotbugs = "4.10.4" -squareup-okhttp3-okhttp = "5.4.0" -squareup-okio = "3.17.0" +squareup-okhttp3-okhttp = "5.5.0" +squareup-okio = "3.18.1" stephenc-jcip = "1.0-1" swagger3 = "2.2.54" tdunning-tdigest = "3.3" testcontainers = "2.0.5" thetaphi-forbiddenapis = "3.10" threeten-bp = "1.7.4" +# @keep required at test-compile time by no.nav.security:mock-oauth2-server +toolsjackson = "3.2.1" xerial-snappy = "1.1.10.8" [plugins] @@ -517,7 +519,7 @@ slf4j-jcloverslf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j slf4j-jultoslf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" } -squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver" } +squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "squareup-okhttp3-okhttp" } squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "squareup-okhttp3-okhttp" } squareup-okhttp3-okhttp-jvm = { module = "com.squareup.okhttp3:okhttp-jvm", version.ref = "squareup-okhttp3-okhttp" } squareup-okio = { module = "com.squareup.okio:okio", version.ref = "squareup-okio" } @@ -528,4 +530,6 @@ tdunning-tdigest = { module = "com.tdunning:t-digest", version.ref = "tdunning-t testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } testcontainers-kafka = { module = "org.testcontainers:testcontainers-kafka", version.ref = "testcontainers" } threeten-bp = { module = "org.threeten:threetenbp", version.ref = "threeten-bp" } +toolsjackson-jackson-bom = { module = "tools.jackson:jackson-bom", version.ref = "toolsjackson" } +toolsjackson-jackson-core-databind = { module = "tools.jackson.core:jackson-databind" } xerial-snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "xerial-snappy" } diff --git a/solr/licenses/accessors-smart-2.5.2.jar.sha1 b/solr/licenses/accessors-smart-2.5.2.jar.sha1 deleted file mode 100644 index 4066b6ec5b49..000000000000 --- a/solr/licenses/accessors-smart-2.5.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ce16fd235cfee48e67eda33e684423bba09f7d07 diff --git a/solr/licenses/accessors-smart-2.6.0.jar.sha1 b/solr/licenses/accessors-smart-2.6.0.jar.sha1 new file mode 100644 index 000000000000..802eb1ac4079 --- /dev/null +++ b/solr/licenses/accessors-smart-2.6.0.jar.sha1 @@ -0,0 +1 @@ +2d96f1d9b6ab7f13261aa81b15703574185747a0 diff --git a/solr/licenses/jackson-core-3.2.1.jar.sha1 b/solr/licenses/jackson-core-3.2.1.jar.sha1 new file mode 100644 index 000000000000..7e4facbdea61 --- /dev/null +++ b/solr/licenses/jackson-core-3.2.1.jar.sha1 @@ -0,0 +1 @@ +5bff2a525073cff8a8206751f6f6bc4650b81b94 diff --git a/solr/licenses/jackson-databind-3.2.1.jar.sha1 b/solr/licenses/jackson-databind-3.2.1.jar.sha1 new file mode 100644 index 000000000000..68e64964253a --- /dev/null +++ b/solr/licenses/jackson-databind-3.2.1.jar.sha1 @@ -0,0 +1 @@ +363dc46ceb44a97cba68cb0e9da4a3cb5bf723d4 diff --git a/solr/licenses/jackson-module-kotlin-2.22.2.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.22.2.jar.sha1 deleted file mode 100644 index 3e114150e810..000000000000 --- a/solr/licenses/jackson-module-kotlin-2.22.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -763406d0e01fe9f257cc2acb85a6e8570571cc95 diff --git a/solr/licenses/jackson-module-kotlin-3.2.1.jar.sha1 b/solr/licenses/jackson-module-kotlin-3.2.1.jar.sha1 new file mode 100644 index 000000000000..d4d5ecf757c4 --- /dev/null +++ b/solr/licenses/jackson-module-kotlin-3.2.1.jar.sha1 @@ -0,0 +1 @@ +05736cce26dbd34c33ac0b1af4fd66928336d87d diff --git a/solr/licenses/json-smart-2.5.2.jar.sha1 b/solr/licenses/json-smart-2.5.2.jar.sha1 deleted file mode 100644 index 24ba18aac54a..000000000000 --- a/solr/licenses/json-smart-2.5.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -95d166b18f95907be0f46cdb9e1c0695eed03387 diff --git a/solr/licenses/json-smart-2.6.0.jar.sha1 b/solr/licenses/json-smart-2.6.0.jar.sha1 new file mode 100644 index 000000000000..63edf20663bd --- /dev/null +++ b/solr/licenses/json-smart-2.6.0.jar.sha1 @@ -0,0 +1 @@ +5f858a43a325a8673da6869ab2bc787a1bcb2244 diff --git a/solr/licenses/kotlin-reflect-2.1.21.jar.sha1 b/solr/licenses/kotlin-reflect-2.1.21.jar.sha1 deleted file mode 100644 index 3ccfc58edbd4..000000000000 --- a/solr/licenses/kotlin-reflect-2.1.21.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4929da533b3f04a101e4bb9ae0ee51a1d8107614 diff --git a/solr/licenses/kotlin-reflect-2.2.21.jar.sha1 b/solr/licenses/kotlin-reflect-2.2.21.jar.sha1 new file mode 100644 index 000000000000..a390a4dcab38 --- /dev/null +++ b/solr/licenses/kotlin-reflect-2.2.21.jar.sha1 @@ -0,0 +1 @@ +17bc47f5dfe27c2351538e711f0afe377b0de6b2 diff --git a/solr/licenses/kotlinx-serialization-core-jvm-1.11.0.jar.sha1 b/solr/licenses/kotlinx-serialization-core-jvm-1.11.0.jar.sha1 deleted file mode 100644 index 63a141cdda56..000000000000 --- a/solr/licenses/kotlinx-serialization-core-jvm-1.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c1905c9bf7452b045d5af9248835abe64ddad6bf diff --git a/solr/licenses/kotlinx-serialization-json-jvm-1.11.0.jar.sha1 b/solr/licenses/kotlinx-serialization-json-jvm-1.11.0.jar.sha1 deleted file mode 100644 index 56104eea74be..000000000000 --- a/solr/licenses/kotlinx-serialization-json-jvm-1.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e7e045e99e56f07599bb9ccb708c2190e2af0606 diff --git a/solr/licenses/mock-oauth2-server-5.0.2.jar.sha1 b/solr/licenses/mock-oauth2-server-5.0.2.jar.sha1 deleted file mode 100644 index 9e29dbab8b27..000000000000 --- a/solr/licenses/mock-oauth2-server-5.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -10d9765a4290bcf20c11c7db66784d679edd95f0 diff --git a/solr/licenses/mock-oauth2-server-6.0.2.jar.sha1 b/solr/licenses/mock-oauth2-server-6.0.2.jar.sha1 new file mode 100644 index 000000000000..c1e848b16891 --- /dev/null +++ b/solr/licenses/mock-oauth2-server-6.0.2.jar.sha1 @@ -0,0 +1 @@ +b304cf0f6f63eba30b87ce3007d71f152a6e0405 diff --git a/solr/licenses/mockwebserver-5.2.1.jar.sha1 b/solr/licenses/mockwebserver-5.2.1.jar.sha1 deleted file mode 100644 index 5de8754ba67e..000000000000 --- a/solr/licenses/mockwebserver-5.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3506708250e4ab1ad57730457ee435b0250afbf0 diff --git a/solr/licenses/mockwebserver-5.5.0.jar.sha1 b/solr/licenses/mockwebserver-5.5.0.jar.sha1 new file mode 100644 index 000000000000..32f44b18ba75 --- /dev/null +++ b/solr/licenses/mockwebserver-5.5.0.jar.sha1 @@ -0,0 +1 @@ +a54f047a793c0d613ab89f6463d6c4642a641770 diff --git a/solr/licenses/mockwebserver3-5.2.1.jar.sha1 b/solr/licenses/mockwebserver3-5.2.1.jar.sha1 deleted file mode 100644 index c2d952040f77..000000000000 --- a/solr/licenses/mockwebserver3-5.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1c402f4adc0e3a272df3154fcf19abf77e487898 diff --git a/solr/licenses/mockwebserver3-5.5.0.jar.sha1 b/solr/licenses/mockwebserver3-5.5.0.jar.sha1 new file mode 100644 index 000000000000..19f990294dd8 --- /dev/null +++ b/solr/licenses/mockwebserver3-5.5.0.jar.sha1 @@ -0,0 +1 @@ +08379486f073a2761d468f9d65dae7cdad482895 diff --git a/solr/licenses/oauth2-oidc-sdk-11.37.1.jar.sha1 b/solr/licenses/oauth2-oidc-sdk-11.37.1.jar.sha1 deleted file mode 100644 index e122ddf5687d..000000000000 --- a/solr/licenses/oauth2-oidc-sdk-11.37.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c59f93d816c9d18e1afcd72ca511cd1f3314bb2e diff --git a/solr/licenses/oauth2-oidc-sdk-11.38.2.jar.sha1 b/solr/licenses/oauth2-oidc-sdk-11.38.2.jar.sha1 new file mode 100644 index 000000000000..566723e324ad --- /dev/null +++ b/solr/licenses/oauth2-oidc-sdk-11.38.2.jar.sha1 @@ -0,0 +1 @@ +633504f3430c148cc583d9d481f5f4e48e29cccf diff --git a/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 deleted file mode 100644 index 4b0e22d054de..000000000000 --- a/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1fae6fccaae70e60b31153c6a7680306a86ed31 diff --git a/solr/licenses/okhttp-jvm-5.5.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.5.0.jar.sha1 new file mode 100644 index 000000000000..9beb7e7afeb9 --- /dev/null +++ b/solr/licenses/okhttp-jvm-5.5.0.jar.sha1 @@ -0,0 +1 @@ +cefe1eb26408176d30511420b7e36b065e38bca0 diff --git a/solr/licenses/okio-jvm-3.17.0.jar.sha1 b/solr/licenses/okio-jvm-3.17.0.jar.sha1 deleted file mode 100644 index bfc2de534714..000000000000 --- a/solr/licenses/okio-jvm-3.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a12d684ec0df9541b3869ae60a4a5257fd3613df diff --git a/solr/licenses/okio-jvm-3.18.1.jar.sha1 b/solr/licenses/okio-jvm-3.18.1.jar.sha1 new file mode 100644 index 000000000000..970a3c8c5931 --- /dev/null +++ b/solr/licenses/okio-jvm-3.18.1.jar.sha1 @@ -0,0 +1 @@ +a3a8128bb3a0157d23ecc18c17e8330d9c0ac96c diff --git a/solr/modules/jwt-auth/build.gradle b/solr/modules/jwt-auth/build.gradle index 5d14768fd152..efd8c848920e 100644 --- a/solr/modules/jwt-auth/build.gradle +++ b/solr/modules/jwt-auth/build.gradle @@ -47,8 +47,9 @@ dependencies { testImplementation(libs.navsecurity.mockoauth2server, { exclude group: "io.netty", module: "netty-all" }) - // required by mock-oauth2-server - testImplementation libs.fasterxml.jackson.core.databind + // required by mock-oauth2-server, which uses Jackson 3 (tools.jackson) internally + testImplementation platform(libs.toolsjackson.jackson.bom) + testImplementation libs.toolsjackson.jackson.core.databind testImplementation libs.bouncycastle.bcpkix testImplementation libs.bouncycastle.bcprov diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index acdb4e22107e..5a4599957509 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -5,12 +5,11 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.9.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.11.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.22.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-kotlin:2.22.2=jarValidation,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:7.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.4=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspath @@ -35,13 +34,13 @@ com.lmax:disruptor:4.0.0=solrPlatformLibs com.nimbusds:content-type:2.3=jarValidation,testCompileClasspath,testRuntimeClasspath com.nimbusds:lang-tag:1.7=jarValidation,testCompileClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:10.9.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.nimbusds:oauth2-oidc-sdk:11.37.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:mockwebserver3:5.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:mockwebserver:5.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp-jvm:5.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:5.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:3.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.nimbusds:oauth2-oidc-sdk:11.38.2=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:mockwebserver3:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:mockwebserver:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp-jvm:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.22.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -94,9 +93,9 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runti javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath -net.minidev:accessors-smart:2.5.2=jarValidation,testCompileClasspath,testRuntimeClasspath -net.minidev:json-smart:2.5.2=jarValidation,testCompileClasspath,testRuntimeClasspath -no.nav.security:mock-oauth2-server:5.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath +net.minidev:accessors-smart:2.6.0=jarValidation,testCompileClasspath,testRuntimeClasspath +net.minidev:json-smart:2.6.0=jarValidation,testCompileClasspath,testRuntimeClasspath +no.nav.security:mock-oauth2-server:6.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -176,18 +175,13 @@ org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,runtime org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-reflect:2.1.21=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-reflect:2.2.21=jarValidation,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21=testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:2.4.0=jarValidation org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.4.0=jarValidation,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.4.0=jarValidation,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.4.0=jarValidation -org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0=jarValidation,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.11.0=jarValidation,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core:1.11.0=jarValidation,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.11.0=jarValidation,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0=jarValidation,testRuntimeClasspath org.jetbrains:annotations:26.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath @@ -207,4 +201,8 @@ org.slf4j:jcl-over-slf4j:2.0.18=jarValidation,runtimeClasspath,runtimeLibs,solrP org.slf4j:jul-to-slf4j:2.0.18=solrPlatformLibs org.slf4j:slf4j-api:2.0.18=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +tools.jackson.core:jackson-core:3.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath +tools.jackson.module:jackson-module-kotlin:3.2.1=jarValidation,testRuntimeClasspath +tools.jackson:jackson-bom:3.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath empty=missingdoclet,packaging diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile index 19e4c5be005b..003d7debe542 100644 --- a/solr/ui/gradle.lockfile +++ b/solr/ui/gradle.lockfile @@ -108,9 +108,9 @@ com.arkivanov.mvikotlin:mvikotlin-main-wasm-js:4.4.0=wasmJsCompileClasspath,wasm com.arkivanov.mvikotlin:mvikotlin-main:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata com.arkivanov.mvikotlin:mvikotlin-wasm-js:4.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath com.arkivanov.mvikotlin:mvikotlin:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata -com.squareup.okio:okio-jvm:3.17.0=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath -com.squareup.okio:okio-wasm-js:3.17.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath -com.squareup.okio:okio:3.17.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata +com.squareup.okio:okio-jvm:3.18.1=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath +com.squareup.okio:okio-wasm-js:3.18.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath +com.squareup.okio:okio:3.18.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata com.typesafe:config:1.4.9=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath io.github.oshai:kotlin-logging-jvm:8.0.4=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath io.github.oshai:kotlin-logging-wasm-js:8.0.4=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath