Apache Solr open-source search software
Use JNA/WMI instead of PowerShell to list Windows processes (#4718)
Jan Høydahlf53cbfe90b9a
diff --git a/changelog/unreleased/GITHUB#4718-jna-wmi-windows-process-list.yml b/changelog/unreleased/GITHUB#4718-jna-wmi-windows-process-list.ymlnew file mode 100644index 00000000000..a5d7b0e7b4a--- /dev/null+++ b/changelog/unreleased/GITHUB#4718-jna-wmi-windows-process-list.yml@@ -0,0 +1,13 @@+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc++title: >+ SolrProcessManager now uses JNA/WMI to list Java processes on Windows, instead of spawning an+ external PowerShell process+type: changed+authors:+ - name: Jan Høydahl+ - name: Chan Chan+ nick: chan-dx+links:+ - name: GITHUB#4718+ url: https://github.com/apache/solr/pull/4718diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex eb091426a28..5536f1066ee 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -388,6 +388,7 @@ jersey-media-jsonjackson = { module = "org.glassfish.jersey.media:jersey-media-jjetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }# @keep transitive dependency for version alignmentjna = { module = "net.java.dev.jna:jna", version.ref = "jna" }+jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }# @keep transitive dependency for version alignmentjodatime-jodatime = { module = "joda-time:joda-time", version.ref = "joda-time" }junit-junit = { module = "junit:junit", version.ref = "junit" }diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policyindex 1af2b7df05a..f93c8cd997c 100644--- a/gradle/testing/randomization/policies/solr-tests.policy+++ b/gradle/testing/randomization/policies/solr-tests.policy@@ -261,8 +261,10 @@ grant {// Run javapermission java.io.FilePermission "${java.home}${/}-", "execute";- // Required by SolrProcessManager on Windows to find Solr processes, used by StatusTool (CLI)- permission java.io.FilePermission "<<ALL FILES>>", "execute";+ // Required by SolrProcessManager on Windows to find Solr processes (used by StatusTool CLI):+ // JNA queries WMI, which loads the native jnidispatch library and reads jna.* system properties.+ permission java.lang.RuntimePermission "loadLibrary.*";+ permission java.util.PropertyPermission "jna.*", "read";};// Grant all permissions to Gradle test runner classes.diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfileindex f9bd41aa647..6ff32e81fa3 100644--- a/solr/api/gradle.lockfile+++ b/solr/api/gradle.lockfile@@ -88,6 +88,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuildjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,swaggerBuild,testRuntimeClasspathdiff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfileindex c17f2adfd0c..71839506fb9 100644--- a/solr/benchmark/gradle.lockfile+++ b/solr/benchmark/gradle.lockfile@@ -77,6 +77,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimejakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,testRuntimeClasspathnet.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/core/build.gradle b/solr/core/build.gradleindex e214a2b4404..9d2e45e51f8 100644--- a/solr/core/build.gradle+++ b/solr/core/build.gradle@@ -154,6 +154,9 @@ dependencies {implementation libs.apache.commons.exec+ // Used by SolrProcessManager to query running processes via WMI on Windows+ implementation libs.jna.platform+implementation libs.apache.log4j.apiimplementation libs.apache.log4j.coreruntimeOnly libs.apache.log4j.slf4j2impldiff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfileindex 1805a1ebfaf..171511bb8df 100644--- a/solr/core/gradle.lockfile+++ b/solr/core/gradle.lockfile@@ -85,6 +85,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=cliDocsRuntime,jarValidation,runtimejavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/core/src/java/org/apache/solr/cli/SolrProcessManager.java b/solr/core/src/java/org/apache/solr/cli/SolrProcessManager.javaindex 3001fd2afd5..e51e6c92f9d 100644--- a/solr/core/src/java/org/apache/solr/cli/SolrProcessManager.java+++ b/solr/core/src/java/org/apache/solr/cli/SolrProcessManager.java@@ -18,12 +18,12 @@ package org.apache.solr.cli;import static org.apache.solr.servlet.CoreContainerProvider.SOLR_INSTALL_DIR;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.ObjectMapper;+import com.sun.jna.platform.win32.COM.COMUtils;+import com.sun.jna.platform.win32.COM.WbemcliUtil.WmiQuery;+import com.sun.jna.platform.win32.COM.WbemcliUtil.WmiResult;+import com.sun.jna.platform.win32.Ole32;import java.io.IOException;import java.lang.invoke.MethodHandles;-import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;import java.util.ArrayList;@@ -37,7 +37,6 @@ import java.util.Optional;import java.util.regex.Pattern;import java.util.stream.Collectors;import java.util.stream.Stream;-import org.apache.commons.io.IOUtils;import org.apache.lucene.util.Constants;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.EnvUtils;@@ -160,7 +159,7 @@ public class SolrProcessManager {/*** Gets the command line of a process as a string. For Windows, we need to fetch command lines- * using a PowerShell command.+ * from WMI (see {@link #commandLinesWindows()}).** @param ph the process handle* @return the command line of the process@@ -174,55 +173,45 @@ public class SolrProcessManager {}/**- * Gets the command lines of all java processes on Windows using PowerShell.+ * WMI columns to select from {@code Win32_Process}. The enum constant names are used verbatim as+ * the WQL {@code SELECT} column names (WQL is case-insensitive).+ */+ enum ProcessProperty {+ PROCESSID,+ COMMANDLINE+ }++ /**+ * Gets the command lines of all java processes on Windows by querying WMI ({@code Win32_Process})+ * through JNA. This avoids spawning an external PowerShell process.** @return a map of process IDs to command lines*/private static Map<Long, String> commandLinesWindows() {+ COMUtils.checkRC(Ole32.INSTANCE.CoInitializeEx(null, Ole32.COINIT_MULTITHREADED));try {- Process process =- new ProcessBuilder(- "powershell.exe",- "-Command",- "Get-CimInstance -ClassName Win32_Process | Where-Object { $_.Name -like '*java*' } | Select-Object ProcessId, CommandLine | ConvertTo-Json -Depth 1")- .redirectErrorStream(true)- .start();- String output = IOUtils.toString(process.getInputStream(), StandardCharsets.UTF_8);- int exitCode = process.waitFor();- if (exitCode != 0) {- String errorText = IOUtils.toString(process.getErrorStream(), StandardCharsets.UTF_8);- throw new SolrException(- SolrException.ErrorCode.SERVER_ERROR,- "Error getting command lines for Windows: " + errorText);+ // Filter to java processes in the WQL query itself; LIKE is case-insensitive in WMI, so this+ // matches processes named e.g. "java.exe" while letting WMI do the filtering.+ WmiResult<ProcessProperty> result =+ new WmiQuery<>("Win32_Process WHERE Name LIKE '%java%'", ProcessProperty.class).execute();+ Map<Long, String> pidToCommandLine = new HashMap<>();+ for (int i = 0; i < result.getResultCount(); i++) {+ Object commandLine = result.getValue(ProcessProperty.COMMANDLINE, i);+ Object processId = result.getValue(ProcessProperty.PROCESSID, i);+ // CommandLine can be null if the current user cannot read it for that process+ if (commandLine != null && processId != null) {+ pidToCommandLine.put(((Number) processId).longValue(), commandLine.toString());+ }}- return parseWindowsPidToCommandLineJson(output);- } catch (IOException e) {+ return pidToCommandLine;+ } catch (RuntimeException e) {throw new SolrException(- SolrException.ErrorCode.SERVER_ERROR, "Error getting command lines for Windows");- } catch (InterruptedException e) {- Thread.currentThread().interrupt();- throw new SolrException(- SolrException.ErrorCode.SERVER_ERROR,- "Interrupted while getting command lines for Windows");+ SolrException.ErrorCode.SERVER_ERROR, "Error getting command lines for Windows", e);+ } finally {+ Ole32.INSTANCE.CoUninitialize();}}- static Map<Long, String> parseWindowsPidToCommandLineJson(String jsonString)- throws JsonProcessingException {- // Json format: [{"ProcessId": 1234, "CommandLine": "java foo"}]- ObjectMapper mapper = new ObjectMapper();- List<WindowsProcessInfo> processInfoList =- mapper.readValue(jsonString, new TypeReference<>() {});- return processInfoList.stream()- .filter(p -> p.CommandLine != null)- .collect(Collectors.toMap(p -> p.ProcessId, p -> p.CommandLine));- }-- public static class WindowsProcessInfo {- public long ProcessId;- public String CommandLine;- }-/*** Gets the arguments of a process as a list of strings. With workaround for Windows.*diff --git a/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java b/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.javaindex 2102e1e3d75..e31ccb3381e 100644--- a/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java+++ b/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java@@ -16,7 +16,6 @@*/package org.apache.solr.cli;-import com.fasterxml.jackson.core.JsonProcessingException;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStream;@@ -28,7 +27,6 @@ import java.nio.file.Files;import java.nio.file.Path;import java.util.Arrays;import java.util.Collection;-import java.util.Map;import java.util.stream.Collectors;import org.apache.commons.math3.util.Pair;import org.apache.solr.SolrTestCase;@@ -175,15 +173,6 @@ public class SolrProcessManagerTest extends SolrTestCase {assertEquals("https://localhost:" + processHttps.getKey() + "/solr", https.getLocalUrl());}- public void testParseWindowsPidToCommandLineJson() throws JsonProcessingException {- String jsonResponseFromPowershell =- "[{\"ProcessId\": 9356, \"CommandLine\": \"date\"}, {\"ProcessId\": 4736, \"CommandLine\": null}\n]";- Map<Long, String> pidToCommandLine =- SolrProcessManager.parseWindowsPidToCommandLineJson(jsonResponseFromPowershell);- assertEquals(1, pidToCommandLine.size());- assertEquals("date", pidToCommandLine.get(9356L));- }-/*** This class is started as new java process by {@link SolrProcessManagerTest#createProcess}, and* it listens to an HTTP(s) port to simulate a real Solr process.diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex 78e9a567ce9..2edb7b74727 100644--- a/solr/cross-dc-manager/gradle.lockfile+++ b/solr/cross-dc-manager/gradle.lockfile@@ -94,7 +94,8 @@ javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy-agent:1.18.11=jarValidation,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testRuntimeClasspath-net.java.dev.jna:jna:5.19.1=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-compress:1.28.0=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/licenses/jna-LICENSE-ASL.txt b/solr/licenses/jna-LICENSE-ASL.txtnew file mode 100644index 00000000000..f433b1a53f5--- /dev/null+++ b/solr/licenses/jna-LICENSE-ASL.txt@@ -0,0 +1,177 @@++ 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 CONDITIONSdiff --git a/solr/licenses/jna-NOTICE.txt b/solr/licenses/jna-NOTICE.txtnew file mode 100644index 00000000000..9d95afbeb58--- /dev/null+++ b/solr/licenses/jna-NOTICE.txt@@ -0,0 +1,26 @@+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later++Java Native Access (JNA) is licensed under the LGPL, version 2.1+or later, or (from version 4.0 onward) the Apache License,+version 2.0.++You can freely decide which license you want to apply to the project.++You may obtain a copy of the LGPL License at:++http://www.gnu.org/licenses/licenses.html++A copy is also included in the downloadable source code package+containing JNA, in file "LGPL2.1", under the same directory+as this file.++You may obtain a copy of the Apache License at:++http://www.apache.org/licenses/++A copy is also included in the downloadable source code package+containing JNA, in file "AL2.0", under the same directory+as this file.++Commercial support may be available, please e-mail+twall[at]users[dot]sf[dot]net.diff --git a/solr/licenses/jna-platform-5.19.1.jar.sha1 b/solr/licenses/jna-platform-5.19.1.jar.sha1new file mode 100644index 00000000000..a8e52af219a--- /dev/null+++ b/solr/licenses/jna-platform-5.19.1.jar.sha1@@ -0,0 +1 @@+d1e54d9231da5ca3fa730d52960deaa555475468diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex 73dddbd8b55..1b220f30855 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -80,6 +80,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtijavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex d2a654f638a..95fc38a9c6f 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -77,6 +77,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex 877101252d1..ae22bcac415 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -81,6 +81,8 @@ javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy-agent:1.18.11=jarValidation,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfileindex ae0c3c00eb7..9b052ccefde 100644--- a/solr/modules/cuvs/gradle.lockfile+++ b/solr/modules/cuvs/gradle.lockfile@@ -79,6 +79,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfileindex ea6998d2414..f04441f5432 100644--- a/solr/modules/extraction/gradle.lockfile+++ b/solr/modules/extraction/gradle.lockfile@@ -80,7 +80,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath-net.java.dev.jna:jna:5.19.1=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-compress:1.28.0=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex a7002317402..b4849f74a4c 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -132,6 +132,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 5ead519cc6d..9b23da96176 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -93,6 +93,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtijavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathnet.minidev:accessors-smart:2.6.0=jarValidation,testCompileClasspath,testRuntimeClasspathnet.minidev:json-smart:2.6.0=jarValidation,testCompileClasspath,testRuntimeClasspathno.nav.security:mock-oauth2-server:6.0.2=jarValidation,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex 6d9476894c5..90b07d30279 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -78,6 +78,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfileindex 88abfcf4b77..55cdfd05264 100644--- a/solr/modules/language-models/gradle.lockfile+++ b/solr/modules/language-models/gradle.lockfile@@ -90,6 +90,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex c1ca484611b..63ce6d89151 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -78,6 +78,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtijavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex f36824804e8..776757e3420 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -86,6 +86,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex fe06315daee..9faece987e3 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -82,7 +82,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtijavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath-net.java.dev.jna:jna:5.19.1=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-compress:1.28.0=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex 581ec9cd364..49a89b70764 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -77,6 +77,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfileindex 78723226dce..c55e83c1cb2 100644--- a/solr/modules/sql/gradle.lockfile+++ b/solr/modules/sql/gradle.lockfile@@ -80,6 +80,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibsjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.apache.calcite.avatica:avatica-core:1.29.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.apache.calcite.avatica:avatica-metrics:1.29.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfileindex 898ac7fd392..82fa16ba5ac 100644--- a/solr/server/gradle.lockfile+++ b/solr/server/gradle.lockfile@@ -75,6 +75,8 @@ jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,runtimeClasspath,sjakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,solrCorejakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,solrCorejavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,solrCore+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,solrCoreorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,solrCoreorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,solrCoreorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,solrCorediff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfileindex 30e19dbce72..99b9b73ebfb 100644--- a/solr/solr-ref-guide/gradle.lockfile+++ b/solr/solr-ref-guide/gradle.lockfile@@ -78,6 +78,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=cliClasspath,testRuntimeClasspathjakarta.xml.bind:jakarta.xml.bind-api:4.0.2=cliClasspath,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=cliClasspath,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=cliClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=cliClasspath,testRuntimeClasspathorg.apache.calcite.avatica:avatica-core:1.29.0=testRuntimeClasspathorg.apache.calcite.avatica:avatica-metrics:1.29.0=testRuntimeClasspathdiff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfileindex 605b204396b..3392569923b 100644--- a/solr/solrj-jetty/gradle.lockfile+++ b/solr/solrj-jetty/gradle.lockfile@@ -77,6 +77,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimejakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex 6bc3f5bb8d1..27965afb9cd 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -77,6 +77,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimejakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspathorg.apache.calcite.avatica:avatica-core:1.29.0=jarValidation,testRuntimeClasspathorg.apache.calcite.avatica:avatica-metrics:1.29.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex 2956930f876..229e38dfccd 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -77,6 +77,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimejakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex 02ba06f6f05..505248db4da 100644--- a/solr/solrj/gradle.lockfile+++ b/solr/solrj/gradle.lockfile@@ -78,6 +78,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspathdiff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex ba2fa1252d2..e980dd6d4e7 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -78,6 +78,8 @@ jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimejakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathjavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,runtimeClasspath,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,runtimeClasspath,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,testRuntimeClasspathorg.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfileindex 978c0c97895..39a9333e15d 100644--- a/solr/webapp/gradle.lockfile+++ b/solr/webapp/gradle.lockfile@@ -79,6 +79,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,solrCore,testRuntimeCljavax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessorjunit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspathnet.bytebuddy:byte-buddy:1.18.11=jarValidation,testCompileClasspath,testRuntimeClasspath+net.java.dev.jna:jna-platform:5.19.1=jarValidation,solrCore,testRuntimeClasspath+net.java.dev.jna:jna:5.19.1=jarValidation,solrCore,testRuntimeClasspathorg.antlr:antlr4-runtime:4.13.2=jarValidation,solrCore,testRuntimeClasspathorg.apache.calcite.avatica:avatica-core:1.29.0=jarValidation,testRuntimeClasspathorg.apache.calcite.avatica:avatica-metrics:1.29.0=jarValidation,testRuntimeClasspath