diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a3783feaac1..55f1340fcf2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ apache-httpcomponents-httpclient = "4.5.14" apache-httpcomponents-httpcore = "4.4.16" apache-httpcomponents-httpmime = "4.5.14" apache-kafka = "3.9.1" -apache-log4j = "2.21.0" +apache-log4j = "2.25.2" apache-lucene = "10.2.1" apache-opennlp = "2.5.4" apache-poi = "5.2.2" @@ -46,7 +46,6 @@ apache-tomcat = "6.0.53" apache-zookeeper = "3.9.4" # @keep for version alignment apiguardian = "1.1.2" -aqute-bnd = "6.4.1" # @keep Asciidoctor mathjax version used in ref-guide asciidoctor-mathjax = "0.0.9" # @keep Asciidoctor tabs version used in ref-guide @@ -175,7 +174,6 @@ onnx = "1.22.0" openapi = "7.14.0" openjdk-jmh = "1.37" opentelemetry = "1.53.0" -osgi-annotation = "8.1.0" oshai-logging = "7.0.13" # @keep for version alignment ow2-asm = "9.8" @@ -298,7 +296,6 @@ apache-zookeeper-jute = { module = "org.apache.zookeeper:zookeeper-jute", versio apache-zookeeper-zookeeper = { module = "org.apache.zookeeper:zookeeper", version.ref = "apache-zookeeper" } # @keep transitive dependency for version alignment apiguardian-api = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" } -aqute-bnd-annotation = { module = "biz.aQute.bnd:biz.aQute.bnd.annotation", version.ref = "aqute-bnd" } bc-jose4j = { module = "org.bitbucket.b_c:jose4j", version.ref = "bc-jose4j" } benmanes-caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "benmanes-caffeine" } bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncycastle" } @@ -486,7 +483,6 @@ opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref opentelemetry-sdkextension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" } opentelemetry-sdktesting = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" } opentelemetry-sdktrace = { module = "io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" } -osgi-annotation = { module = "org.osgi:osgi.annotation", version.ref = "osgi-annotation" } oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "oshai-logging" } # @keep transitive dependency for version alignment ow2-asm-asm = { module = "org.ow2.asm:asm", version.ref = "ow2-asm" } diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index e336621b4f6..87d5c81d679 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -87,9 +87,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 2b37c13583d..82d20a9d4e8 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -78,9 +78,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntime org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/build.gradle b/solr/core/build.gradle index 24fd610fc68..e6c9a5ec29f 100644 --- a/solr/core/build.gradle +++ b/solr/core/build.gradle @@ -173,9 +173,6 @@ dependencies { // For faster XML processing than the JDK implementation libs.codehaus.woodstox.stax2api implementation libs.fasterxml.woodstox.core - // See https://issues.apache.org/jira/browse/LOG4J2-3609 due to needing these annotations - compileOnly libs.aqute.bnd.annotation - compileOnly libs.osgi.annotation compileOnly libs.stephenc.jcip.annotations diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 24f951cdc09..e2d5b3edae8 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1=compileClasspath,compileOnlyHelper,jarValidation +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -85,9 +85,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testCompileClasspath,testRun org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-icu:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -169,9 +169,10 @@ org.mockito:mockito-core:5.19.0=jarValidation,testCompileClasspath,testRuntimeCl org.mockito:mockito-subclass:5.19.0=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation -org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation -org.osgi:osgi.annotation:8.1.0=compileClasspath,compileOnlyHelper,jarValidation +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.ow2.asm:asm:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 4c08c73b9b9..98b86712f28 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -111,12 +111,12 @@ org.apache.kafka:kafka-streams:3.9.1=jarValidation,runtimeClasspath,runtimeLibs, org.apache.kafka:kafka-tools-api:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.kafka:kafka-transaction-coordinator:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.kafka:kafka_2.13:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 b/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 deleted file mode 100644 index 3046cf2dbf2..00000000000 --- a/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -381d53a2e2f48c2623e04990f4a2b06b6885cab1 diff --git a/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 b/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 new file mode 100644 index 00000000000..c8dceb1bd47 --- /dev/null +++ b/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1 @@ -0,0 +1 @@ +2f2be18c936d08cf46ea6cfa0043f34afdf38705 diff --git a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 41761161aba..00000000000 --- a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 diff --git a/solr/licenses/log4j-1.2-api-2.25.2.jar.sha1 b/solr/licenses/log4j-1.2-api-2.25.2.jar.sha1 new file mode 100644 index 00000000000..4a8b9de2698 --- /dev/null +++ b/solr/licenses/log4j-1.2-api-2.25.2.jar.sha1 @@ -0,0 +1 @@ +d937f5ea23f027563332126b3c96f970ed9536bb diff --git a/solr/licenses/log4j-api-2.21.0.jar.sha1 b/solr/licenses/log4j-api-2.21.0.jar.sha1 deleted file mode 100644 index 6a05a4e5cb0..00000000000 --- a/solr/licenses/log4j-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -760192f2b69eacf4a4afc78e5a1d7a8de054fcbd diff --git a/solr/licenses/log4j-api-2.25.2.jar.sha1 b/solr/licenses/log4j-api-2.25.2.jar.sha1 new file mode 100644 index 00000000000..fe5fb4ed233 --- /dev/null +++ b/solr/licenses/log4j-api-2.25.2.jar.sha1 @@ -0,0 +1 @@ +292c1a2b1702f1e1e3adb13e1c57e5bff60335ff diff --git a/solr/licenses/log4j-core-2.21.0.jar.sha1 b/solr/licenses/log4j-core-2.21.0.jar.sha1 deleted file mode 100644 index 0a2615fc478..00000000000 --- a/solr/licenses/log4j-core-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -122e1a9e0603cc9eae07b0846a6ff01f2454bc49 diff --git a/solr/licenses/log4j-core-2.25.2.jar.sha1 b/solr/licenses/log4j-core-2.25.2.jar.sha1 new file mode 100644 index 00000000000..3600995155e --- /dev/null +++ b/solr/licenses/log4j-core-2.25.2.jar.sha1 @@ -0,0 +1 @@ +d4d0ad2e51e03e531f784891fbfff1bae1e13a12 diff --git a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 deleted file mode 100644 index f7ee63037a5..00000000000 --- a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c90f410a98ddbbfe90b4ebe7f1e23526d72c0c96 diff --git a/solr/licenses/log4j-layout-template-json-2.25.2.jar.sha1 b/solr/licenses/log4j-layout-template-json-2.25.2.jar.sha1 new file mode 100644 index 00000000000..4d31f4e6b72 --- /dev/null +++ b/solr/licenses/log4j-layout-template-json-2.25.2.jar.sha1 @@ -0,0 +1 @@ +099a187f133581427d072b9e8a4ac8c31014f868 diff --git a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 deleted file mode 100644 index f5d1f87d8f1..00000000000 --- a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -070c38c479f4c495cab11da8396348eebffefcb2 diff --git a/solr/licenses/log4j-slf4j2-impl-2.25.2.jar.sha1 b/solr/licenses/log4j-slf4j2-impl-2.25.2.jar.sha1 new file mode 100644 index 00000000000..1f523dead43 --- /dev/null +++ b/solr/licenses/log4j-slf4j2-impl-2.25.2.jar.sha1 @@ -0,0 +1 @@ +5eec0c392661dee8a366baec17e8896900dd978f diff --git a/solr/licenses/log4j-web-2.21.0.jar.sha1 b/solr/licenses/log4j-web-2.21.0.jar.sha1 deleted file mode 100644 index f2ae414b1ed..00000000000 --- a/solr/licenses/log4j-web-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b6f3db6a2b00b033ec2c9ca8eabb08a00728df2 diff --git a/solr/licenses/log4j-web-2.25.2.jar.sha1 b/solr/licenses/log4j-web-2.25.2.jar.sha1 new file mode 100644 index 00000000000..3313bba9549 --- /dev/null +++ b/solr/licenses/log4j-web-2.25.2.jar.sha1 @@ -0,0 +1 @@ +e9a3ebece79628db4bd7aef753f77eeb49c03843 diff --git a/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 b/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 new file mode 100644 index 00000000000..cf2ff8d99b8 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1 @@ -0,0 +1 @@ +f5c2cd6e670c3c5d440d3003efd5ef2ead5c68eb diff --git a/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt b/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt new file mode 100644 index 00000000000..7a4a3ea2424 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt b/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt new file mode 100644 index 00000000000..e92555bedf0 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt @@ -0,0 +1,47 @@ +# Notices for osgi + +This content is produced and maintained by the OSGi Specification Project. + + * Project home: https://projects.eclipse.org/projects/technology.osgi + +## Trademarks + +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. + +## Copyright + +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. + +## Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Apache License, Version 2.0 which is available at +http://www.apache.org/licenses/LICENSE-2.0 + +SPDX-License-Identifier: Apache-2.0 + +## Source Code + +The project maintains the following source code repositories: + + * https://github.com/osgi/osgi.git + +## Third-party Content + +The Content may include items that have been sourced from third parties as follows:

+ +JUnit + + * License: CPL-1.0 (JUnit 3), EPL-1.0 (JUnit 4), EPL-2.0 (JUnit 5) + * Project: https://junit.org/ + * Source: https://github.com/junit-team + +Apache Software Foundation + + * License: Apache-2.0 + * Project: https://apache.org/ + * Source: https://github.com/apache/ + \ No newline at end of file diff --git a/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 b/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 new file mode 100644 index 00000000000..6bcb6a4c3ca --- /dev/null +++ b/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1 @@ -0,0 +1 @@ +dc3cd4ec96c0b3c5459fe00694bd73a816ecf93e diff --git a/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt b/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt new file mode 100644 index 00000000000..7a4a3ea2424 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt b/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt new file mode 100644 index 00000000000..e92555bedf0 --- /dev/null +++ b/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt @@ -0,0 +1,47 @@ +# Notices for osgi + +This content is produced and maintained by the OSGi Specification Project. + + * Project home: https://projects.eclipse.org/projects/technology.osgi + +## Trademarks + +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. + +## Copyright + +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. + +## Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Apache License, Version 2.0 which is available at +http://www.apache.org/licenses/LICENSE-2.0 + +SPDX-License-Identifier: Apache-2.0 + +## Source Code + +The project maintains the following source code repositories: + + * https://github.com/osgi/osgi.git + +## Third-party Content + +The Content may include items that have been sourced from third parties as follows:

+ +JUnit + + * License: CPL-1.0 (JUnit 3), EPL-1.0 (JUnit 4), EPL-2.0 (JUnit 5) + * Project: https://junit.org/ + * Source: https://github.com/junit-team + +Apache Software Foundation + + * License: Apache-2.0 + * Project: https://apache.org/ + * Source: https://github.com/apache/ + \ No newline at end of file diff --git a/solr/licenses/spotbugs-annotations-4.8.6.jar.sha1 b/solr/licenses/spotbugs-annotations-4.8.6.jar.sha1 new file mode 100644 index 00000000000..0e8489288ce --- /dev/null +++ b/solr/licenses/spotbugs-annotations-4.8.6.jar.sha1 @@ -0,0 +1 @@ +1dcffed3e561ed32134a0dff4717f19bc2fdf4d8 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 1d7b0cb3705..5b4118d9fea 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -80,12 +80,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-icu:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 8755114aba2..f5bf43c892b 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -77,12 +77,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index afeb2262a96..7782191d563 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -81,12 +81,12 @@ org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClass org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.kafka:kafka-clients:3.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/build.gradle b/solr/modules/extraction/build.gradle index da6ebaccd68..46943a910cc 100644 --- a/solr/modules/extraction/build.gradle +++ b/solr/modules/extraction/build.gradle @@ -19,6 +19,22 @@ apply plugin: 'java-library' description = 'Solr Integration with Tika for extracting content from binary file formats such as Microsoft Word and Adobe PDF' +configurations.configureEach { + // Exclude SpotBugs Annotations, a `compileOnlyApi` dependency of Log4j. + // + // Why: + // - Log4j includes them only to silence harmless `-Xlint:classfile` warnings + // when consumers reference classes annotated with `@SuppressFBWarnings`. + // Without the jar, compilation may emit warnings (and fail under `-Werror`). + // See: https://github.com/apache/logging-log4j2/issues/3110#issuecomment-2423586754 + // + // - However, SpotBugs Annotations are LGPL-2.1 licensed. Including them, + // even at compile time, breaks our license compatibility checks. + // + // Net result: unless compiling with `-Werror`, it is safe to exclude the jar. + exclude group: "com.github.spotbugs", module: "spotbugs-annotations" +} + dependencies { implementation platform(project(':platform')) implementation project(':solr:core') diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index abff70b0d7c..072aa821989 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath com.adobe.xmp:xmpcore:6.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.82=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -116,12 +117,12 @@ org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtime org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.james:apache-mime4j-core:0.8.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.james:apache-mime4j-dom:0.8.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -222,6 +223,10 @@ org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.opengis:geoapi:3.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index a342546f048..a30d24acb88 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -128,12 +128,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 0197986d4d9..8acab430477 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -95,12 +95,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index c5ef6c13c02..9825f4c611b 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -79,12 +79,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index f02cf3adf47..e18c5be3591 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -92,12 +92,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index 96e07a47c84..82ab553ff6f 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -78,12 +78,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index e3bb85e3910..d777f046cde 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -113,12 +113,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index eae8773a29b..7990be3e9ab 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -104,12 +104,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index c6b9ec9b326..6c7a5e1371c 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -77,12 +77,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 3eaef7ee425..ecd1695f4bb 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -88,12 +88,12 @@ org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,permitUnusedDeclar org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-icu:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile index e2bc0266ba5..9aa914662ae 100644 --- a/solr/prometheus-exporter/gradle.lockfile +++ b/solr/prometheus-exporter/gradle.lockfile @@ -81,12 +81,12 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs +org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,solrPlatformLibs,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 30301aa9a88..474ce77fe06 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -74,12 +74,12 @@ org.apache.curator:curator-framework:5.9.0=jarValidation,runtimeClasspath,solrCo org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,solrCore org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,solrCore org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-1.2-api:2.21.0=jarValidation,libExt,runtimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=jarValidation,libExt,runtimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,libExt,runtimeClasspath,solrCore -org.apache.logging.log4j:log4j-web:2.21.0=jarValidation,libExt,runtimeClasspath +org.apache.logging.log4j:log4j-1.2-api:2.25.2=jarValidation,libExt,runtimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,libExt,runtimeClasspath,solrCore +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,libExt,runtimeClasspath,solrCore +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=jarValidation,libExt,runtimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,libExt,runtimeClasspath,solrCore +org.apache.logging.log4j:log4j-web:2.25.2=jarValidation,libExt,runtimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,runtimeClasspath,solrCore org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,solrCore org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index da72ace20fd..e60aab8ceee 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -76,9 +76,9 @@ org.apache.curator:curator-test:5.9.0=testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=localJavadocs,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index f06a94b212f..301c285f012 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -94,9 +94,9 @@ org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,testRuntimeClasspa org.apache.httpcomponents:httpclient:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 8670d8252a7..1f00935cc87 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -91,9 +91,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 55b9900e353..ffa71613c81 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -87,9 +87,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index c665cd9707b..28b2669a3fc 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -1,6 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -13,7 +14,7 @@ com.fasterxml.jackson:jackson-bom:2.20.0=apiHelper,compileClasspath,jarValidatio com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.2.2=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyHelper,permitUnusedDeclared +com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyHelper,permitUnusedDeclared,testCompileClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor @@ -78,9 +79,9 @@ org.apache.curator:curator-test:5.9.0=compileClasspath,jarValidation,runtimeClas org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-core:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-kuromoji:10.2.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.lucene:lucene-analysis-nori:10.2.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath @@ -147,6 +148,10 @@ org.junit:junit-bom:5.13.4=compileOnlyHelper,permitUnusedDeclared org.junit:junit-bom:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 7fd09d19e3c..788009c8f5f 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -74,12 +74,12 @@ org.apache.curator:curator-framework:5.9.0=permitUnusedDeclared,solrCore org.apache.httpcomponents:httpclient:4.5.14=permitUnusedDeclared,solrCore org.apache.httpcomponents:httpcore:4.4.16=permitUnusedDeclared,solrCore org.apache.httpcomponents:httpmime:4.5.14=permitUnusedDeclared,solrCore -org.apache.logging.log4j:log4j-1.2-api:2.21.0=serverLib -org.apache.logging.log4j:log4j-api:2.21.0=permitUnusedDeclared,serverLib,solrCore -org.apache.logging.log4j:log4j-core:2.21.0=permitUnusedDeclared,serverLib,solrCore -org.apache.logging.log4j:log4j-layout-template-json:2.21.0=serverLib -org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=permitUnusedDeclared,serverLib,solrCore -org.apache.logging.log4j:log4j-web:2.21.0=serverLib +org.apache.logging.log4j:log4j-1.2-api:2.25.2=serverLib +org.apache.logging.log4j:log4j-api:2.25.2=permitUnusedDeclared,serverLib,solrCore +org.apache.logging.log4j:log4j-core:2.25.2=permitUnusedDeclared,serverLib,solrCore +org.apache.logging.log4j:log4j-layout-template-json:2.25.2=serverLib +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=permitUnusedDeclared,serverLib,solrCore +org.apache.logging.log4j:log4j-web:2.25.2=serverLib org.apache.lucene:lucene-analysis-common:10.2.1=permitUnusedDeclared,solrCore org.apache.lucene:lucene-analysis-kuromoji:10.2.1=permitUnusedDeclared,solrCore org.apache.lucene:lucene-analysis-nori:10.2.1=permitUnusedDeclared,solrCore