Skip to content

Commit df910e4

Browse files
solrbotsolrbot
committed
Update apache.log4j to v2.25.2
1 parent 3759c3e commit df910e4

Some content is hidden

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

44 files changed

+156
-139
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.2"
4040
apache-lucene = "10.3.1"
4141
apache-opennlp = "2.5.6"
4242
apache-poi = "5.2.2"

‎solr/api/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath
9595
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath
9696
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath
9797
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath
98-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,testRuntimeClasspath
99-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,testRuntimeClasspath
100-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,testRuntimeClasspath
98+
org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,testRuntimeClasspath
99+
org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,testRuntimeClasspath
100+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,testRuntimeClasspath
101101
org.apache.lucene:lucene-analysis-common:10.3.1=jarValidation,testCompileClasspath,testRuntimeClasspath
102102
org.apache.lucene:lucene-analysis-kuromoji:10.3.1=jarValidation,testRuntimeClasspath
103103
org.apache.lucene:lucene-analysis-nori:10.3.1=jarValidation,testRuntimeClasspath

‎solr/benchmark/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntime
8686
org.apache.httpcomponents:httpclient:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath
8787
org.apache.httpcomponents:httpcore:4.4.16=jarValidation,runtimeClasspath,testRuntimeClasspath
8888
org.apache.httpcomponents:httpmime:4.5.14=jarValidation,runtimeClasspath,testRuntimeClasspath
89-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
90-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
91-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
89+
org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,testRuntimeClasspath
90+
org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,testRuntimeClasspath
91+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,testRuntimeClasspath
9292
org.apache.lucene:lucene-analysis-common:10.3.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9393
org.apache.lucene:lucene-analysis-kuromoji:10.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath
9494
org.apache.lucene:lucene-analysis-nori:10.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 9 additions & 6 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
@@ -95,9 +96,9 @@ org.apache.curator:curator-test:5.9.0=jarValidation,testCompileClasspath,testRun
9596
org.apache.httpcomponents:httpclient:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
9697
org.apache.httpcomponents:httpcore:4.4.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
9798
org.apache.httpcomponents:httpmime:4.5.14=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
98-
org.apache.logging.log4j:log4j-api:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
99-
org.apache.logging.log4j:log4j-core:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
100-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
99+
org.apache.logging.log4j:log4j-api:2.25.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
100+
org.apache.logging.log4j:log4j-core:2.25.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
101+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
101102
org.apache.lucene:lucene-analysis-common:10.3.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
102103
org.apache.lucene:lucene-analysis-icu:10.3.1=jarValidation,testRuntimeClasspath
103104
org.apache.lucene:lucene-analysis-kuromoji:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
@@ -179,8 +180,10 @@ org.mockito:mockito-core:5.19.0=jarValidation,testCompileClasspath,testRuntimeCl
179180
org.mockito:mockito-subclass:5.19.0=jarValidation,testRuntimeClasspath
180181
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
181182
org.opentest4j:opentest4j:1.2.0=jarValidation,testCompileClasspath,testRuntimeClasspath
182-
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
183-
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
183+
org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath
184+
org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath
185+
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath
186+
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation,testCompileClasspath
184187
org.osgi:osgi.annotation:8.1.0=compileClasspath,compileOnlyHelper,jarValidation
185188
org.ow2.asm:asm-commons:9.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
186189
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
@@ -120,12 +120,12 @@ org.apache.kafka:kafka-streams:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,
120120
org.apache.kafka:kafka-tools-api:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
121121
org.apache.kafka:kafka-transaction-coordinator:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
122122
org.apache.kafka:kafka_2.13:3.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
123-
org.apache.logging.log4j:log4j-1.2-api:2.21.0=solrPlatformLibs
124-
org.apache.logging.log4j:log4j-api:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
125-
org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
126-
org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs
127-
org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
128-
org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs
123+
org.apache.logging.log4j:log4j-1.2-api:2.25.2=solrPlatformLibs
124+
org.apache.logging.log4j:log4j-api:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
125+
org.apache.logging.log4j:log4j-core:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
126+
org.apache.logging.log4j:log4j-layout-template-json:2.25.2=solrPlatformLibs
127+
org.apache.logging.log4j:log4j-slf4j2-impl:2.25.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
128+
org.apache.logging.log4j:log4j-web:2.25.2=solrPlatformLibs
129129
org.apache.lucene:lucene-analysis-common:10.3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
130130
org.apache.lucene:lucene-analysis-kuromoji:10.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
131131
org.apache.lucene:lucene-analysis-nori:10.3.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.

‎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/cuvs-java-25.10.0.jar.sha1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6c22acfbdbc7f3a4a78a2edea46124df872e9ea5
1+
885ad074984741128c7cc723851e790711f91a6e

‎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.2.jar.sha1‎

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

0 commit comments

Comments
 (0)