This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 2d233df0085 Update Log4j to version `2.25.3` in branch 9.x (#3963)
2d233df0085 is described below
commit 2d233df008591bcbccb360f5309c884f898d4293
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Fri Dec 19 10:02:55 2025 +0100
Update Log4j to version `2.25.3` in branch 9.x (#3963)
* Update Log4j to version `2.25.3` in branch 9.x
This change upgrades Apache Log4j from version `2.21.0` to version `2.25.3`.
* fix: force usage of Error Prone version 2.31.0
---
changelog/unreleased/PR#3963-update-log4j.yml | 9 +
gradle/validation/error-prone.gradle | 20 +-
solr/core/build.gradle | 18 +-
.../biz.aQute.bnd.annotation-7.1.0.jar.sha1 | 1 +
solr/licenses/log4j-1.2-api-2.21.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.25.3.jar.sha1 | 1 +
solr/licenses/log4j-api-2.21.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.25.3.jar.sha1 | 1 +
solr/licenses/log4j-core-2.21.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.25.3.jar.sha1 | 1 +
.../log4j-layout-template-json-2.21.0.jar.sha1 | 1 -
.../log4j-layout-template-json-2.25.3.jar.sha1 | 1 +
solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 | 1 +
solr/licenses/log4j-web-2.21.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.25.3.jar.sha1 | 1 +
.../org.osgi.annotation.bundle-2.0.0.jar.sha1 | 1 +
.../org.osgi.annotation.bundle-LICENSE-ASL.txt | 201 +++++++++++++++++++++
.../licenses/org.osgi.annotation.bundle-NOTICE.txt | 47 +++++
.../org.osgi.annotation.versioning-1.1.2.jar.sha1 | 1 +
.../org.osgi.annotation.versioning-LICENSE-ASL.txt | 201 +++++++++++++++++++++
.../org.osgi.annotation.versioning-NOTICE.txt | 47 +++++
solr/test-framework/build.gradle | 10 +-
versions.lock | 16 +-
versions.props | 2 +-
25 files changed, 556 insertions(+), 30 deletions(-)
diff --git a/changelog/unreleased/PR#3963-update-log4j.yml
b/changelog/unreleased/PR#3963-update-log4j.yml
new file mode 100644
index 00000000000..a6ce8a01f34
--- /dev/null
+++ b/changelog/unreleased/PR#3963-update-log4j.yml
@@ -0,0 +1,9 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Upgrade Log4j to 2.25.3
+type: dependency_update
+authors:
+ - name: Piotr P. Karwasz
+ nick: ppkarwasz
+ url: https://home.apache.org/phonebook.html?uid=pkarwasz
+merge_requests:
+ - 3963
\ No newline at end of file
diff --git a/gradle/validation/error-prone.gradle
b/gradle/validation/error-prone.gradle
index 97311445468..0ea24799bf3 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -35,19 +35,19 @@ if (skipReason) {
}
}
-configurations.all {
- resolutionStrategy {
- eachDependency { details ->
- if (details.requested.group == "com.google.errorprone" &&
- (details.requested.name == "error_prone_core" ||
details.requested.name == "error_prone_annotations")) {
- details.useVersion("2.31.0")
- details.because("Lock Error Prone dependencies to 2.31.0 to prevent
accidental upgrades")
+allprojects { prj ->
+ dependencies {
+ constraints {
+ rootConfiguration('com.google.errorprone:error_prone_annotations') {
+ version { strictly '2.31.0' }
+ because 'Lock Error Prone dependencies to 2.31.0 to prevent accidental
upgrades'
+ }
+ rootConfiguration('com.google.errorprone:error_prone_core') {
+ version { strictly '2.31.0' }
+ because 'Lock Error Prone dependencies to 2.31.0 to prevent accidental
upgrades'
}
}
}
-}
-
-allprojects { prj ->
plugins.withType(JavaPlugin) {
// LUCENE-9650: Errorprone on master/gradle does not work when running as
plugin
// inside a forked Javac process. Javac running inside Gradle works,
because we have
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 0c0a8343bf9..ca814834fe8 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -152,8 +152,14 @@ dependencies {
implementation 'org.apache.commons:commons-exec'
- implementation 'org.apache.logging.log4j:log4j-api'
- implementation 'org.apache.logging.log4j:log4j-core'
+ implementation('org.apache.logging.log4j:log4j-api', {
+ exclude group: 'biz.aQute.bnd', module:'biz.aQute.bnd.annotation'
+ because 'https://github.com/apache/logging-log4j2/issues/4007'
+ })
+ implementation('org.apache.logging.log4j:log4j-core', {
+ exclude group: 'biz.aQute.bnd', module:'biz.aQute.bnd.annotation'
+ because 'https://github.com/apache/logging-log4j2/issues/4007'
+ })
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl'
// For the PrometheusResponseWriter
@@ -167,8 +173,14 @@ dependencies {
implementation 'org.codehaus.woodstox:stax2-api'
implementation 'com.fasterxml.woodstox:woodstox-core'
// See https://issues.apache.org/jira/browse/LOG4J2-3609 due to needing
these annotations
- compileOnly 'biz.aQute.bnd:biz.aQute.bnd.annotation'
compileOnly 'org.osgi:osgi.annotation'
+ // Only needed to prevent an `-Xlint:classfile` warning during compilation:
+ //
+ // woodstox-core-7.0.0.jar(/com/ctc/wstx/stax/WstxInputFactory.class):
+ // warning: Cannot find annotation method 'value()' in type
'ServiceProvider': class file for aQute.bnd.annotation.spi.ServiceProvider not
found
+ //
+ // Otherwise, the absence of these annotations at compile time has no effect.
+ compileOnly 'biz.aQute.bnd:biz.aQute.bnd.annotation'
compileOnly 'com.github.stephenc.jcip:jcip-annotations'
diff --git a/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1
b/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1
new file mode 100644
index 00000000000..c8dceb1bd47
--- /dev/null
+++ b/solr/licenses/biz.aQute.bnd.annotation-7.1.0.jar.sha1
@@ -0,0 +1 @@
+2f2be18c936d08cf46ea6cfa0043f34afdf38705
diff --git a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1
b/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1
deleted file mode 100644
index 41761161aba..00000000000
--- a/solr/licenses/log4j-1.2-api-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-12bad3819a9570807f3c97315930699584c12152
diff --git a/solr/licenses/log4j-1.2-api-2.25.3.jar.sha1
b/solr/licenses/log4j-1.2-api-2.25.3.jar.sha1
new file mode 100644
index 00000000000..83aec31eda7
--- /dev/null
+++ b/solr/licenses/log4j-1.2-api-2.25.3.jar.sha1
@@ -0,0 +1 @@
+a7e550e638a5e534fd944616c5ae665a67e9501e
diff --git a/solr/licenses/log4j-api-2.21.0.jar.sha1
b/solr/licenses/log4j-api-2.21.0.jar.sha1
deleted file mode 100644
index 6a05a4e5cb0..00000000000
--- a/solr/licenses/log4j-api-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-760192f2b69eacf4a4afc78e5a1d7a8de054fcbd
diff --git a/solr/licenses/log4j-api-2.25.3.jar.sha1
b/solr/licenses/log4j-api-2.25.3.jar.sha1
new file mode 100644
index 00000000000..4c2f3c5d8ca
--- /dev/null
+++ b/solr/licenses/log4j-api-2.25.3.jar.sha1
@@ -0,0 +1 @@
+fb385330d89c2d61058ef649403f214633569205
diff --git a/solr/licenses/log4j-core-2.21.0.jar.sha1
b/solr/licenses/log4j-core-2.21.0.jar.sha1
deleted file mode 100644
index 0a2615fc478..00000000000
--- a/solr/licenses/log4j-core-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-122e1a9e0603cc9eae07b0846a6ff01f2454bc49
diff --git a/solr/licenses/log4j-core-2.25.3.jar.sha1
b/solr/licenses/log4j-core-2.25.3.jar.sha1
new file mode 100644
index 00000000000..be271a904a9
--- /dev/null
+++ b/solr/licenses/log4j-core-2.25.3.jar.sha1
@@ -0,0 +1 @@
+dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea
diff --git a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1
b/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1
deleted file mode 100644
index f7ee63037a5..00000000000
--- a/solr/licenses/log4j-layout-template-json-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c90f410a98ddbbfe90b4ebe7f1e23526d72c0c96
diff --git a/solr/licenses/log4j-layout-template-json-2.25.3.jar.sha1
b/solr/licenses/log4j-layout-template-json-2.25.3.jar.sha1
new file mode 100644
index 00000000000..d71865ab1d3
--- /dev/null
+++ b/solr/licenses/log4j-layout-template-json-2.25.3.jar.sha1
@@ -0,0 +1 @@
+23ed918fa6e76480896db0e4d11cdda801ff2686
diff --git a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1
b/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1
deleted file mode 100644
index f5d1f87d8f1..00000000000
--- a/solr/licenses/log4j-slf4j2-impl-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-070c38c479f4c495cab11da8396348eebffefcb2
diff --git a/solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1
b/solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1
new file mode 100644
index 00000000000..97e56ba12e5
--- /dev/null
+++ b/solr/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1
@@ -0,0 +1 @@
+8d1aca17817adb4a15720e64b98caf9cb3b2cc51
diff --git a/solr/licenses/log4j-web-2.21.0.jar.sha1
b/solr/licenses/log4j-web-2.21.0.jar.sha1
deleted file mode 100644
index f2ae414b1ed..00000000000
--- a/solr/licenses/log4j-web-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b6f3db6a2b00b033ec2c9ca8eabb08a00728df2
diff --git a/solr/licenses/log4j-web-2.25.3.jar.sha1
b/solr/licenses/log4j-web-2.25.3.jar.sha1
new file mode 100644
index 00000000000..7c32788006d
--- /dev/null
+++ b/solr/licenses/log4j-web-2.25.3.jar.sha1
@@ -0,0 +1 @@
+f3ccb822d3f38660089d750a520a00ec096ce1eb
diff --git a/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1
b/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1
new file mode 100644
index 00000000000..cf2ff8d99b8
--- /dev/null
+++ b/solr/licenses/org.osgi.annotation.bundle-2.0.0.jar.sha1
@@ -0,0 +1 @@
+f5c2cd6e670c3c5d440d3003efd5ef2ead5c68eb
diff --git a/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt
b/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/solr/licenses/org.osgi.annotation.bundle-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ 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 CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt
b/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt
new file mode 100644
index 00000000000..e92555bedf0
--- /dev/null
+++ b/solr/licenses/org.osgi.annotation.bundle-NOTICE.txt
@@ -0,0 +1,47 @@
+# Notices for osgi
+
+This content is produced and maintained by the OSGi Specification Project.
+
+ * Project home: https://projects.eclipse.org/projects/technology.osgi
+
+## Trademarks
+
+OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and
+the Eclipse Logo are registered trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers.
+For more information regarding authorship of content, please consult the
+listed source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Apache License, Version 2.0 which is available at
+http://www.apache.org/licenses/LICENSE-2.0
+
+SPDX-License-Identifier: Apache-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+ * https://github.com/osgi/osgi.git
+
+## Third-party Content
+
+The Content may include items that have been sourced from third parties as
follows:</p>
+
+JUnit
+
+ * License: CPL-1.0 (JUnit 3), EPL-1.0 (JUnit 4), EPL-2.0 (JUnit 5)
+ * Project: https://junit.org/
+ * Source: https://github.com/junit-team
+
+Apache Software Foundation
+
+ * License: Apache-2.0
+ * Project: https://apache.org/
+ * Source: https://github.com/apache/
+
\ No newline at end of file
diff --git a/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1
b/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1
new file mode 100644
index 00000000000..6bcb6a4c3ca
--- /dev/null
+++ b/solr/licenses/org.osgi.annotation.versioning-1.1.2.jar.sha1
@@ -0,0 +1 @@
+dc3cd4ec96c0b3c5459fe00694bd73a816ecf93e
diff --git a/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt
b/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/solr/licenses/org.osgi.annotation.versioning-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ 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 CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt
b/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt
new file mode 100644
index 00000000000..e92555bedf0
--- /dev/null
+++ b/solr/licenses/org.osgi.annotation.versioning-NOTICE.txt
@@ -0,0 +1,47 @@
+# Notices for osgi
+
+This content is produced and maintained by the OSGi Specification Project.
+
+ * Project home: https://projects.eclipse.org/projects/technology.osgi
+
+## Trademarks
+
+OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and
+the Eclipse Logo are registered trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers.
+For more information regarding authorship of content, please consult the
+listed source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Apache License, Version 2.0 which is available at
+http://www.apache.org/licenses/LICENSE-2.0
+
+SPDX-License-Identifier: Apache-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+ * https://github.com/osgi/osgi.git
+
+## Third-party Content
+
+The Content may include items that have been sourced from third parties as
follows:</p>
+
+JUnit
+
+ * License: CPL-1.0 (JUnit 3), EPL-1.0 (JUnit 4), EPL-2.0 (JUnit 5)
+ * Project: https://junit.org/
+ * Source: https://github.com/junit-team
+
+Apache Software Foundation
+
+ * License: Apache-2.0
+ * Project: https://apache.org/
+ * Source: https://github.com/apache/
+
\ No newline at end of file
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 7905d2be21a..981eccdef0d 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -50,8 +50,14 @@ dependencies {
implementation 'commons-io:commons-io'
implementation 'org.slf4j:slf4j-api'
- implementation 'org.apache.logging.log4j:log4j-api'
- implementation 'org.apache.logging.log4j:log4j-core'
+ implementation('org.apache.logging.log4j:log4j-api', {
+ exclude group: 'biz.aQute.bnd', module:'biz.aQute.bnd.annotation'
+ because 'https://github.com/apache/logging-log4j2/issues/4007'
+ })
+ implementation('org.apache.logging.log4j:log4j-core', {
+ exclude group: 'biz.aQute.bnd', module:'biz.aQute.bnd.annotation'
+ because 'https://github.com/apache/logging-log4j2/issues/4007'
+ })
implementation 'io.opentracing:opentracing-noop'
implementation 'io.opentracing:opentracing-util'
implementation 'io.opentracing:opentracing-api'
diff --git a/versions.lock b/versions.lock
index c0462303c2e..395e5bb8e67 100644
--- a/versions.lock
+++ b/versions.lock
@@ -46,7 +46,7 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1
constraints: 1a1001a6)
com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6)
com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626)
com.google.code.gson:gson:2.11.0 (8 constraints: 566fc864)
-com.google.errorprone:error_prone_annotations:2.31.0 (15 constraints: a5c51259)
+com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 72cf7ec0)
com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37)
com.google.guava:guava:33.1.0-jre (26 constraints: 0280374a)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2
constraints: 4b35b0a0)
@@ -250,12 +250,12 @@ org.apache.kerby:kerby-asn1:2.1.0 (1 constraints:
fe0bf0f4)
org.apache.kerby:kerby-config:2.1.0 (4 constraints: 51317aba)
org.apache.kerby:kerby-pkix:2.1.0 (1 constraints: 720b03e5)
org.apache.kerby:kerby-util:2.1.0 (2 constraints: 6718efb6)
-org.apache.logging.log4j:log4j-1.2-api:2.21.0 (1 constraints: 3705363b)
-org.apache.logging.log4j:log4j-api:2.21.0 (9 constraints: 976ff7be)
-org.apache.logging.log4j:log4j-core:2.21.0 (5 constraints: 5f510091)
-org.apache.logging.log4j:log4j-layout-template-json:2.21.0 (1 constraints:
3705363b)
-org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0 (1 constraints: 3705363b)
-org.apache.logging.log4j:log4j-web:2.21.0 (1 constraints: 3705363b)
+org.apache.logging.log4j:log4j-1.2-api:2.25.3 (1 constraints: 3e05453b)
+org.apache.logging.log4j:log4j-api:2.25.3 (9 constraints: ba6f1ddf)
+org.apache.logging.log4j:log4j-core:2.25.3 (5 constraints: 7b51299b)
+org.apache.logging.log4j:log4j-layout-template-json:2.25.3 (1 constraints:
3e05453b)
+org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3 (1 constraints: 3e05453b)
+org.apache.logging.log4j:log4j-web:2.25.3 (1 constraints: 3e05453b)
org.apache.lucene:lucene-analysis-common:9.12.3 (10 constraints: c8a09441)
org.apache.lucene:lucene-analysis-icu:9.12.3 (1 constraints: 4105623b)
org.apache.lucene:lucene-analysis-kuromoji:9.12.3 (1 constraints: 4105623b)
@@ -402,7 +402,7 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1
constraints: fa0af8e7)
org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36)
org.slf4j:jcl-over-slf4j:2.0.17 (3 constraints: fe17d8b6)
org.slf4j:jul-to-slf4j:2.0.17 (3 constraints: 5828f360)
-org.slf4j:slf4j-api:2.0.17 (80 constraints: 2945b59e)
+org.slf4j:slf4j-api:2.0.17 (80 constraints: 5b45f317)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index 85dcd662a17..bc4aaa154ee 100644
--- a/versions.props
+++ b/versions.props
@@ -56,7 +56,7 @@ org.apache.httpcomponents:httpcore=4.4.16
org.apache.httpcomponents:httpmime=4.5.14
org.apache.kafka:*=3.9.1
org.apache.kerby:*=2.1.0
-org.apache.logging.log4j:*=2.21.0
+org.apache.logging.log4j:*=2.25.3
org.apache.lucene:*=9.12.3
org.apache.tika:*=1.28.5
org.apache.tomcat:annotations-api=6.0.53
