Skip to content

Commit 5fae5cb

Browse files
solrbotsolrbot
committed
Update apache.log4j to v2.25.1
1 parent 6fc60dd commit 5fae5cb

Some content is hidden

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

45 files changed

+215
-169
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ apache-httpcomponents-httpclient = "4.5.14"
3636
apache-httpcomponents-httpcore = "4.4.16"
3737
apache-httpcomponents-httpmime = "4.5.14"
3838
apache-kafka = "3.9.0"
39-
apache-log4j = "2.21.0"
39+
apache-log4j = "2.25.1"
4040
apache-lucene = "10.2.1"
4141
apache-opennlp = "2.5.3"
4242
apache-poi = "5.2.2"

‎solr/api/gradle.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath
107107
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath
108108
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testCompileClasspath,testRuntimeClasspath
109109
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath
110-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath
111-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath
112-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath
110+
org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,testRuntimeClasspath
111+
org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,testRuntimeClasspath
112+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,testRuntimeClasspath
113113
org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath
114114
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath
115115
org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath
@@ -182,7 +182,8 @@ org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath
182182
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
183183
org.semver4j:semver4j:5.8.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
184184
org.slf4j:jcl-over-slf4j:2.0.16=jarValidation,testRuntimeClasspath
185-
org.slf4j:slf4j-api:2.0.16=jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
185+
org.slf4j:slf4j-api:2.0.16=runtimeClasspath,swaggerBuild,testCompileClasspath
186+
org.slf4j:slf4j-api:2.0.17=jarValidation,testRuntimeClasspath
186187
org.slf4j:slf4j-api:2.0.9=swaggerDeps
187188
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,testRuntimeClasspath
188189
org.yaml:snakeyaml:2.2=swaggerDeps

‎solr/benchmark/gradle.lockfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntime
7878
org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7979
org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8080
org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
81-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
82-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
83-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
81+
org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath
82+
org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath
83+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath
8484
org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8585
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath
8686
org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -157,6 +157,7 @@ org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotatio
157157
org.quicktheories:quicktheories:0.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
158158
org.semver4j:semver4j:5.8.0=jarValidation,runtimeClasspath,testRuntimeClasspath
159159
org.slf4j:jcl-over-slf4j:2.0.16=jarValidation,runtimeClasspath,testRuntimeClasspath
160-
org.slf4j:slf4j-api:2.0.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
160+
org.slf4j:slf4j-api:2.0.16=compileClasspath,testCompileClasspath
161+
org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath
161162
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,testRuntimeClasspath
162163
empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared

‎solr/core/gradle.lockfile‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1=compileClasspath,compileOnlyHelper,jarValidation
4+
biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1=compileOnlyHelper,jarValidation
5+
biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath
56
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspath
67
com.carrotsearch:hppc:0.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
78
com.fasterxml.jackson.core:jackson-annotations:2.17.2=permitUnusedDeclared
@@ -26,7 +27,8 @@ com.google.auto.value:auto-value-annotations:1.10.4=annotationProcessor,errorpro
2627
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
2728
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,permitUnusedDeclared,testAnnotationProcessor
2829
com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
29-
com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
30+
com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
31+
com.google.errorprone:error_prone_annotations:2.38.0=compileClasspath,testCompileClasspath
3032
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
3133
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
3234
com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
@@ -90,9 +92,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testCompileClasspath,testRun
9092
org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
9193
org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
9294
org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
93-
org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
94-
org.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
95-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
95+
org.apache.logging.log4j:log4j-api:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
96+
org.apache.logging.log4j:log4j-core:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
97+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
9698
org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
9799
org.apache.lucene:lucene-analysis-icu:10.2.1=jarValidation,testRuntimeClasspath
98100
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -174,7 +176,7 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=compileClasspath,jarValidation,perm
174176
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
175177
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
176178
org.javassist:javassist:3.30.2-GA=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
177-
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
179+
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
178180
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
179181
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
180182
org.junit:junit-bom:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -183,16 +185,19 @@ org.mockito:mockito-core:5.19.0=jarValidation,testCompileClasspath,testRuntimeCl
183185
org.mockito:mockito-subclass:5.19.0=jarValidation,testRuntimeClasspath
184186
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
185187
org.opentest4j:opentest4j:1.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath
186-
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
187-
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
188+
org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath
189+
org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath
190+
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath
191+
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath
188192
org.osgi:osgi.annotation:8.1.0=compileClasspath,compileOnlyHelper,jarValidation
189193
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
190194
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
191195
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
192196
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
193197
org.semver4j:semver4j:5.8.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
194198
org.slf4j:jcl-over-slf4j:2.0.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
195-
org.slf4j:slf4j-api:2.0.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
199+
org.slf4j:slf4j-api:2.0.16=apiHelper,compileClasspath,testCompileClasspath
200+
org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
196201
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
197202
ua.net.nlp:morfologik-ukrainian-search:4.9.1=jarValidation,testRuntimeClasspath
198203
empty=apiHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures

‎solr/cross-dc-manager/gradle.lockfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ org.apache.kafka:kafka-streams:3.9.0=jarValidation,runtimeClasspath,runtimeLibs,
111111
org.apache.kafka:kafka-tools-api:3.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
112112
org.apache.kafka:kafka-transaction-coordinator:3.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
113113
org.apache.kafka:kafka_2.13:3.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
114-
org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs
115-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
116-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
117-
org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs
118-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
119-
org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs
114+
org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs
115+
org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
116+
org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
117+
org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs
118+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
119+
org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs
120120
org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
121121
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
122122
org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -205,6 +205,7 @@ org.scala-lang:scala-reflect:2.13.14=jarValidation,runtimeClasspath,runtimeLibs,
205205
org.semver4j:semver4j:5.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
206206
org.slf4j:jcl-over-slf4j:2.0.16=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
207207
org.slf4j:jul-to-slf4j:2.0.16=solrPlatformLibs
208-
org.slf4j:slf4j-api:2.0.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
208+
org.slf4j:slf4j-api:2.0.16=compileClasspath,testCompileClasspath
209+
org.slf4j:slf4j-api:2.0.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
209210
org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
210211
empty=apiHelper,apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures

‎solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2f2be18c936d08cf46ea6cfa0043f34afdf38705

‎solr/licenses/error_prone_annotations-2.38.0.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fc0ae991433e8590ba51cd558421478318a74c8c

‎solr/licenses/log4j-1.2-api-2.21.0.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/log4j-1.2-api-2.25.1.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
08b3667ec8ee781429169b612b7ca6d6a30682b9

0 commit comments

Comments
 (0)