Skip to content

Commit 7e99c5b

Browse files
committed
Update apache.log4j to v2.25.1
1 parent e83e01b commit 7e99c5b

Some content is hidden

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

43 files changed

+162
-143
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.1"
39-
apache-log4j = "2.21.0"
39+
apache-log4j = "2.25.1"
4040
apache-lucene = "10.2.1"
4141
apache-opennlp = "2.5.4"
4242
apache-poi = "5.2.2"

solr/api/gradle.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath
8989
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath
9090
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath
9191
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath
92-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath
93-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath
94-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath
92+
org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,testRuntimeClasspath
93+
org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,testRuntimeClasspath
94+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,testRuntimeClasspath
9595
org.apache.lucene:lucene-analysis-common:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath
9696
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,testRuntimeClasspath
9797
org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,testRuntimeClasspath

solr/benchmark/gradle.lockfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntime
8080
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath
8181
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,testRuntimeClasspath
8282
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath
83-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
84-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
85-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
83+
org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath
84+
org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath
85+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,testRuntimeClasspath
8686
org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8787
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath
8888
org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,testRuntimeClasspath

solr/core/gradle.lockfile

Lines changed: 12 additions & 8 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.3=jarValidation,testCompileClasspath,testRuntimeClasspath
67
com.carrotsearch:hppc:0.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
78
com.fasterxml.jackson.core:jackson-annotations:2.20=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -21,7 +22,8 @@ com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorpro
2122
com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor
2223
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,errorprone,permitUnusedDeclared,testAnnotationProcessor
2324
com.google.errorprone:error_prone_annotation:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
24-
com.google.errorprone:error_prone_annotations:2.31.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
25+
com.google.errorprone:error_prone_annotations:2.31.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
26+
com.google.errorprone:error_prone_annotations:2.38.0=compileClasspath,testCompileClasspath
2527
com.google.errorprone:error_prone_annotations:2.40.0=annotationProcessor,errorprone,testAnnotationProcessor
2628
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
2729
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
@@ -86,9 +88,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testCompileClasspath,testRun
8688
org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
8789
org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
8890
org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
89-
org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
90-
org.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
91-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
91+
org.apache.logging.log4j:log4j-api:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
92+
org.apache.logging.log4j:log4j-core:2.25.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
93+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
9294
org.apache.lucene:lucene-analysis-common:10.2.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
9395
org.apache.lucene:lucene-analysis-icu:10.2.1=jarValidation,testRuntimeClasspath
9496
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -161,7 +163,7 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.11=compileClasspath,jarValidation,per
161163
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
162164
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
163165
org.javassist:javassist:3.30.2-GA=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
164-
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
166+
org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
165167
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
166168
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
167169
org.junit:junit-bom:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -170,8 +172,10 @@ org.mockito:mockito-core:5.19.0=jarValidation,testCompileClasspath,testRuntimeCl
170172
org.mockito:mockito-subclass:5.19.0=jarValidation,testRuntimeClasspath
171173
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
172174
org.opentest4j:opentest4j:1.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath
173-
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
174-
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
175+
org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath
176+
org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath
177+
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath
178+
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath
175179
org.osgi:osgi.annotation:8.1.0=compileClasspath,compileOnlyHelper,jarValidation
176180
org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
177181
org.ow2.asm:asm-tree:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath

solr/cross-dc-manager/gradle.lockfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ org.apache.kafka:kafka-streams:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,
113113
org.apache.kafka:kafka-tools-api:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
114114
org.apache.kafka:kafka-transaction-coordinator:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
115115
org.apache.kafka:kafka_2.13:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
116-
org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs
117-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
118-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
119-
org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs
120-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
121-
org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs
116+
org.apache.logging.log4j:log4j-1.2-api:2.25.1=solrPlatformLibs
117+
org.apache.logging.log4j:log4j-api:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
118+
org.apache.logging.log4j:log4j-core:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
119+
org.apache.logging.log4j:log4j-layout-template-json:2.25.1=solrPlatformLibs
120+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
121+
org.apache.logging.log4j:log4j-web:2.25.1=solrPlatformLibs
122122
org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
123123
org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
124124
org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2f2be18c936d08cf46ea6cfa0043f34afdf38705

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
08b3667ec8ee781429169b612b7ca6d6a30682b9

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

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

0 commit comments

Comments
 (0)