Skip to content

Commit 156f763

Browse files
solrbotmalliaridis
solrbot
and
malliaridis
authored
chore(deps): update dependency org.ow2.asm:asm to v9.7.1 (#3110)
* chore(deps): update dependency org.ow2.asm:asm to v9.7.1 * Align versions from ow2-asm dependencies * Update and merge asm license files --------- Co-authored-by: Christos Malliaridis <c.malliaridis@gmail.com>
1 parent bb27d3e commit 156f763

37 files changed

+114
-166
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ opentelemetry = "1.46.0"
174174
osgi-annotation = "8.1.0"
175175
oshai-logging = "7.0.3"
176176
# @keep for version alignment
177-
ow2-asm = "9.3"
177+
ow2-asm = "9.7.1"
178178
owasp-dependencycheck = "9.0.8"
179179
# @keep for version alignment
180180
perfmark = "0.27.0"
@@ -476,7 +476,11 @@ opentelemetry-sdktrace = { module = "io.opentelemetry:opentelemetry-sdk-trace",
476476
osgi-annotation = { module = "org.osgi:osgi.annotation", version.ref = "osgi-annotation" }
477477
oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "oshai-logging" }
478478
# @keep transitive dependency for version alignment
479-
ow2-asm = { module = "org.ow2.asm:asm", version.ref = "ow2-asm" }
479+
ow2-asm-asm = { module = "org.ow2.asm:asm", version.ref = "ow2-asm" }
480+
# @keep transitive dependency for version alignment
481+
ow2-asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "ow2-asm" }
482+
# @keep transitive dependency for version alignment
483+
ow2-asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "ow2-asm" }
480484
# @keep transitive dependency for version alignment
481485
perfmark-api = { module = "io.perfmark:perfmark-api", version.ref = "perfmark" }
482486
prometheus-metrics-expositionformats = { module = "io.prometheus:prometheus-metrics-exposition-formats", version.ref = "prometheus-metrics" }

‎solr/api/gradle.lockfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,9 @@ org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspa
174174
org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath
175175
org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath
176176
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
177-
org.ow2.asm:asm-analysis:7.2=jarValidation,testRuntimeClasspath
178-
org.ow2.asm:asm-commons:7.2=jarValidation,testRuntimeClasspath
179-
org.ow2.asm:asm-tree:7.2=jarValidation,testRuntimeClasspath
180-
org.ow2.asm:asm:9.3=jarValidation,testRuntimeClasspath
177+
org.ow2.asm:asm-commons:9.7.1=jarValidation,testRuntimeClasspath
178+
org.ow2.asm:asm-tree:9.7.1=jarValidation,testRuntimeClasspath
179+
org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath
181180
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
182181
org.semver4j:semver4j:5.3.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
183182
org.slf4j:jcl-over-slf4j:2.0.16=jarValidation,testRuntimeClasspath

‎solr/benchmark/gradle.lockfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,9 @@ org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,testRunt
148148
org.openjdk.jmh:jmh-core:1.37=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
149149
org.openjdk.jmh:jmh-generator-annprocess:1.37=annotationProcessor
150150
org.opentest4j:opentest4j:1.2.0=jarValidation,runtimeClasspath,testRuntimeClasspath
151-
org.ow2.asm:asm-analysis:7.2=jarValidation,runtimeClasspath,testRuntimeClasspath
152-
org.ow2.asm:asm-commons:7.2=jarValidation,runtimeClasspath,testRuntimeClasspath
153-
org.ow2.asm:asm-tree:7.2=jarValidation,runtimeClasspath,testRuntimeClasspath
154-
org.ow2.asm:asm:9.3=jarValidation,runtimeClasspath,testRuntimeClasspath
151+
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath
152+
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath
153+
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath
155154
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
156155
org.quicktheories:quicktheories:0.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
157156
org.semver4j:semver4j:5.3.0=jarValidation,runtimeClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,9 @@ org.opentest4j:opentest4j:1.2.0=jarValidation,testCompileClasspath,testRuntimeCl
184184
org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
185185
org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileOnlyHelper,jarValidation
186186
org.osgi:osgi.annotation:8.1.0=compileClasspath,compileOnlyHelper,jarValidation
187-
org.ow2.asm:asm-analysis:7.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
188-
org.ow2.asm:asm-commons:7.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
189-
org.ow2.asm:asm-tree:7.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
190-
org.ow2.asm:asm:9.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
187+
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
188+
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
189+
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
191190
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
192191
org.semver4j:semver4j:5.3.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
193192
org.slf4j:jcl-over-slf4j:2.0.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,9 @@ org.lz4:lz4-java:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLi
188188
org.mockito:mockito-core:5.15.2=jarValidation,testCompileClasspath,testRuntimeClasspath
189189
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
190190
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
191-
org.ow2.asm:asm-analysis:7.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
192-
org.ow2.asm:asm-commons:7.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
193-
org.ow2.asm:asm-tree:7.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
194-
org.ow2.asm:asm:9.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
191+
org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
192+
org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
193+
org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
195194
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testRuntimeClasspath
196195
org.rocksdb:rocksdbjni:7.9.2=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
197196
org.scala-lang.modules:scala-collection-compat_2.13:2.10.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath

‎solr/licenses/asm-9.3.jar.sha1‎

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

‎solr/licenses/asm-9.7.1.jar.sha1‎

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

‎solr/licenses/asm-LICENSE-BSD.txt‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
1-
/***
2-
* ASM: a very small and fast Java bytecode manipulation framework
3-
* Copyright (c) 2000-2011 INRIA, France Telecom
4-
* All rights reserved.
5-
*
6-
* Redistribution and use in source and binary forms, with or without
7-
* modification, are permitted provided that the following conditions
8-
* are met:
9-
* 1. Redistributions of source code must retain the above copyright
10-
* notice, this list of conditions and the following disclaimer.
11-
* 2. Redistributions in binary form must reproduce the above copyright
12-
* notice, this list of conditions and the following disclaimer in the
13-
* documentation and/or other materials provided with the distribution.
14-
* 3. Neither the name of the copyright holders nor the names of its
15-
* contributors may be used to endorse or promote products derived from
16-
* this software without specific prior written permission.
17-
*
18-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21-
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22-
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24-
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28-
* THE POSSIBILITY OF SUCH DAMAGE.
29-
*/
1+
ASM: a very small and fast Java bytecode manipulation framework
2+
Copyright (c) 2000-2011 INRIA, France Telecom
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
1. Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
2. Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
3. Neither the name of the copyright holders nor the names of its
14+
contributors may be used to endorse or promote products derived from
15+
this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
21+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27+
THE POSSIBILITY OF SUCH DAMAGE.

‎solr/licenses/asm-analysis-7.2.jar.sha1‎

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

‎solr/licenses/asm-commons-7.2.jar.sha1‎

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

0 commit comments

Comments
 (0)