diff --git a/CHANGELOG.md b/CHANGELOG.md index d1848ca0e2a9f..57f1ea8080515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.apache.kerby:kerb-admin` from 2.1.0 to 2.1.1 ([#20235](https://github.com/opensearch-project/OpenSearch/pull/20235)) - Bump `org.checkerframework:checker-qual` from 3.49.0 to 3.52.1 ([#20234](https://github.com/opensearch-project/OpenSearch/pull/20234)) - Bump `netty` to 4.2.9.Final ([#20230](https://github.com/opensearch-project/OpenSearch/pull/20230)) +- Bump `log4j` from 2.21.0 to 2.25.3 ([#20308](https://github.com/opensearch-project/OpenSearch/pull/20308)) - Bump `org.apache.logging.log4j:log4j-core` from 2.25.2 to 2.25.3 ([#20300](https://github.com/opensearch-project/OpenSearch/pull/20300)) - Bump `ch.qos.logback:logback-core` from 1.5.20 to 1.5.23 ([#20303](https://github.com/opensearch-project/OpenSearch/pull/20303)) - Bump `com.google.api.grpc:proto-google-iam-v1` from 1.57.0 to 1.58.2 ([#20302](https://github.com/opensearch-project/OpenSearch/pull/20302)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6c090d0de5be4..79ee264bb67dc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,8 @@ jackson_databind = "2.18.2" snakeyaml = "2.1" icu4j = "77.1" supercsv = "2.4.0" -log4j = "2.21.0" +log4j = "2.25.3" +error_prone_annotations = "2.45.0" slf4j = "2.0.17" asm = "9.7" jettison = "1.5.4" diff --git a/libs/core/build.gradle b/libs/core/build.gradle index 7549da0acb38d..932d6f67b0500 100644 --- a/libs/core/build.gradle +++ b/libs/core/build.gradle @@ -73,6 +73,7 @@ tasks.named("thirdPartyAudit").configure { 'org.osgi.framework.SynchronousBundleListener', 'org.osgi.framework.wiring.BundleWire', 'org.osgi.framework.wiring.BundleWiring', + 'org.osgi.framework.wiring.BundleRevision', // Vector API classes 'jdk.incubator.vector.ByteVector', diff --git a/libs/core/licenses/log4j-api-2.21.0.jar.sha1 b/libs/core/licenses/log4j-api-2.21.0.jar.sha1 deleted file mode 100644 index 51446052594aa..0000000000000 --- a/libs/core/licenses/log4j-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -760192f2b69eacf4a4afc78e5a1d7a8de054fcbd \ No newline at end of file diff --git a/libs/core/licenses/log4j-api-2.25.3.jar.sha1 b/libs/core/licenses/log4j-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..97dc53d973766 --- /dev/null +++ b/libs/core/licenses/log4j-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +fb385330d89c2d61058ef649403f214633569205 \ No newline at end of file diff --git a/modules/transport-grpc/build.gradle b/modules/transport-grpc/build.gradle index 8792440f1c28a..d6421b0673235 100644 --- a/modules/transport-grpc/build.gradle +++ b/modules/transport-grpc/build.gradle @@ -25,7 +25,6 @@ dependencies { api project('spi') compileOnly "com.google.code.findbugs:jsr305:3.0.2" runtimeOnly "com.google.guava:guava:${versions.guava}" - implementation "com.google.errorprone:error_prone_annotations:2.24.1" implementation "com.google.guava:failureaccess:1.0.2" implementation "io.grpc:grpc-api:${versions.grpc}" implementation "io.grpc:grpc-core:${versions.grpc}" diff --git a/modules/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 b/modules/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 deleted file mode 100644 index 67723f6f51248..0000000000000 --- a/modules/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32b299e45105aa9b0df8279c74dc1edfcf313ff0 \ No newline at end of file diff --git a/modules/transport-grpc/licenses/error_prone_annotations-LICENSE.txt b/modules/transport-grpc/licenses/error_prone_annotations-LICENSE.txt deleted file mode 100644 index d645695673349..0000000000000 --- a/modules/transport-grpc/licenses/error_prone_annotations-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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/modules/transport-grpc/licenses/error_prone_annotations-NOTICE.txt b/modules/transport-grpc/licenses/error_prone_annotations-NOTICE.txt deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle index 52b1ed328d590..16e85caa35a1f 100644 --- a/plugins/arrow-flight-rpc/build.gradle +++ b/plugins/arrow-flight-rpc/build.gradle @@ -57,7 +57,6 @@ dependencies { runtimeOnly "io.grpc:grpc-core:${versions.grpc}" implementation "io.grpc:grpc-stub:${versions.grpc}" implementation "io.grpc:grpc-netty:${versions.grpc}" - implementation "com.google.errorprone:error_prone_annotations:2.31.0" runtimeOnly "com.google.code.findbugs:jsr305:3.0.2" annotationProcessor 'org.immutables:value:2.10.1' diff --git a/plugins/arrow-flight-rpc/licenses/error_prone_annotations-2.31.0.jar.sha1 b/plugins/arrow-flight-rpc/licenses/error_prone_annotations-2.31.0.jar.sha1 deleted file mode 100644 index 4872d644799f5..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/error_prone_annotations-2.31.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3ba307b915d6d506e98ffbb49e6d2d12edad65b \ No newline at end of file diff --git a/plugins/arrow-flight-rpc/licenses/error_prone_annotations-LICENSE.txt b/plugins/arrow-flight-rpc/licenses/error_prone_annotations-LICENSE.txt deleted file mode 100644 index d645695673349..0000000000000 --- a/plugins/arrow-flight-rpc/licenses/error_prone_annotations-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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/plugins/arrow-flight-rpc/licenses/error_prone_annotations-NOTICE.txt b/plugins/arrow-flight-rpc/licenses/error_prone_annotations-NOTICE.txt deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/plugins/crypto-kms/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/crypto-kms/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 39d9177cb2fac..0000000000000 --- a/plugins/crypto-kms/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 \ No newline at end of file diff --git a/plugins/crypto-kms/licenses/log4j-1.2-api-2.25.3.jar.sha1 b/plugins/crypto-kms/licenses/log4j-1.2-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..ffa0736153da7 --- /dev/null +++ b/plugins/crypto-kms/licenses/log4j-1.2-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +a7e550e638a5e534fd944616c5ae665a67e9501e \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 39d9177cb2fac..0000000000000 --- a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.25.3.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..ffa0736153da7 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +a7e550e638a5e534fd944616c5ae665a67e9501e \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 39d9177cb2fac..0000000000000 --- a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.25.3.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..ffa0736153da7 --- /dev/null +++ b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +a7e550e638a5e534fd944616c5ae665a67e9501e \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 39d9177cb2fac..0000000000000 --- a/plugins/discovery-gce/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.25.3.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..ffa0736153da7 --- /dev/null +++ b/plugins/discovery-gce/licenses/log4j-1.2-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +a7e550e638a5e534fd944616c5ae665a67e9501e \ No newline at end of file diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 63fac4534855a..4793b398059fc 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -63,7 +63,6 @@ dependencies { runtimeOnly "com.google.guava:guava:${guava_version}" runtimeOnly "com.google.guava:failureaccess:1.0.2" - compileOnly "com.google.errorprone:error_prone_annotations:2.38.0" runtimeOnly "org.slf4j:slf4j-api:${versions.slf4j}" // 2.0.16 in bom runtimeOnly "commons-codec:commons-codec:${versions.commonscodec}" // 1.18.0 in bom diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 deleted file mode 100644 index 0e22f98daa61c..0000000000000 --- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -911fdb5b1a1df36719c579ecc6f2957b88bce1ab \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..8463520c396f8 --- /dev/null +++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 @@ -0,0 +1 @@ +4a173925524d8f6c3f39ae8954ee348e8244afd7 \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 9ab823277803a..7c089120d62a9 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -518,7 +518,6 @@ thirdPartyAudit { 'org.conscrypt.Conscrypt', 'org.conscrypt.HandshakeListener', - 'org.slf4j.ext.EventData', 'reactor.blockhound.BlockHound$Builder', 'reactor.blockhound.integration.BlockHoundIntegration', diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.21.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.21.0.jar.sha1 deleted file mode 100644 index 39d9177cb2fac..0000000000000 --- a/plugins/repository-s3/licenses/log4j-1.2-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12bad3819a9570807f3c97315930699584c12152 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.25.3.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..ffa0736153da7 --- /dev/null +++ b/plugins/repository-s3/licenses/log4j-1.2-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +a7e550e638a5e534fd944616c5ae665a67e9501e \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 deleted file mode 100644 index 0e22f98daa61c..0000000000000 --- a/plugins/repository-s3/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -911fdb5b1a1df36719c579ecc6f2957b88bce1ab \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 b/plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..8463520c396f8 --- /dev/null +++ b/plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 @@ -0,0 +1 @@ +4a173925524d8f6c3f39ae8954ee348e8244afd7 \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 2c0d605ff9aac..a8382011536a0 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -98,6 +98,10 @@ dependencies { api libs.log4japi api libs.log4jjul api libs.log4jcore, optional + + compileOnlyApi "org.jspecify:jspecify:1.0.0" + compileOnlyApi "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}" + annotationProcessor libs.log4jcore annotationProcessor project(':libs:opensearch-common') @@ -238,6 +242,7 @@ tasks.named("thirdPartyAudit").configure { ignoreMissingClasses( // from com.fasterxml.jackson.dataformat.yaml.YAMLMapper (jackson-dataformat-yaml) 'com.fasterxml.jackson.databind.ObjectMapper', + 'com.fasterxml.jackson.databind.util.ClassUtil', // from log4j 'com.conversantmedia.util.concurrent.SpinPolicy', @@ -261,8 +266,6 @@ tasks.named("thirdPartyAudit").configure { 'com.fasterxml.jackson.dataformat.xml.XmlMapper', 'com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter', 'com.fasterxml.jackson.databind.node.ObjectNode', - 'org.fusesource.jansi.Ansi', - 'org.fusesource.jansi.AnsiRenderer$Code', 'io.micrometer.context.ContextAccessor', 'io.micrometer.context.ContextRegistry', 'io.micrometer.context.ContextSnapshot', @@ -287,6 +290,7 @@ tasks.named("thirdPartyAudit").configure { 'io.micrometer.core.instrument.composite.CompositeMeterRegistry', 'io.micrometer.core.instrument.search.Search', 'com.lmax.disruptor.EventFactory', + 'com.lmax.disruptor.EventHandler', 'com.lmax.disruptor.EventTranslator', 'com.lmax.disruptor.EventTranslatorTwoArg', 'com.lmax.disruptor.EventTranslatorVararg', @@ -337,6 +341,7 @@ tasks.named("thirdPartyAudit").configure { 'org.osgi.framework.ServiceReference', 'org.osgi.framework.ServiceRegistration', 'org.osgi.framework.SynchronousBundleListener', + 'org.osgi.framework.wiring.BundleRevision', 'org.osgi.framework.wiring.BundleWire', 'org.osgi.framework.wiring.BundleWiring', 'org.slf4j.Logger', diff --git a/server/licenses/log4j-api-2.21.0.jar.sha1 b/server/licenses/log4j-api-2.21.0.jar.sha1 deleted file mode 100644 index 51446052594aa..0000000000000 --- a/server/licenses/log4j-api-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -760192f2b69eacf4a4afc78e5a1d7a8de054fcbd \ No newline at end of file diff --git a/server/licenses/log4j-api-2.25.3.jar.sha1 b/server/licenses/log4j-api-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..97dc53d973766 --- /dev/null +++ b/server/licenses/log4j-api-2.25.3.jar.sha1 @@ -0,0 +1 @@ +fb385330d89c2d61058ef649403f214633569205 \ No newline at end of file diff --git a/server/licenses/log4j-core-2.21.0.jar.sha1 b/server/licenses/log4j-core-2.21.0.jar.sha1 deleted file mode 100644 index c88e6f7a25ca9..0000000000000 --- a/server/licenses/log4j-core-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -122e1a9e0603cc9eae07b0846a6ff01f2454bc49 \ No newline at end of file diff --git a/server/licenses/log4j-core-2.25.3.jar.sha1 b/server/licenses/log4j-core-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..f04606f9c6047 --- /dev/null +++ b/server/licenses/log4j-core-2.25.3.jar.sha1 @@ -0,0 +1 @@ +dd9c8ecba5c8dc5e1574804d0bfdc1ef155ad9ea \ No newline at end of file diff --git a/server/licenses/log4j-jul-2.21.0.jar.sha1 b/server/licenses/log4j-jul-2.21.0.jar.sha1 deleted file mode 100644 index 480010840abca..0000000000000 --- a/server/licenses/log4j-jul-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f0da61113f4a47654677e6a98b1e13ca7de2483d \ No newline at end of file diff --git a/server/licenses/log4j-jul-2.25.3.jar.sha1 b/server/licenses/log4j-jul-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..3a73dca2a65ab --- /dev/null +++ b/server/licenses/log4j-jul-2.25.3.jar.sha1 @@ -0,0 +1 @@ +08bba6d5a56f11931c218c016c96b740e238abbc \ No newline at end of file diff --git a/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java b/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java index 0ab86abea963b..736984b64b649 100644 --- a/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/search/suggest/CompletionSuggestSearchIT.java @@ -1176,7 +1176,7 @@ public void testSkipDuplicates() throws Exception { int weight = randomIntBetween(0, 100); weights[id] = Math.max(weight, weights[id]); String suggestion = "suggestion-" + String.format(Locale.ENGLISH, "%03d", id); - logger.info("Creating {}, id {}, weight {}", suggestion, i, id, weight); + logger.info("Creating {}, i {}, id {}, weight {}", suggestion, i, id, weight); indexRequestBuilders.add( client().prepareIndex(INDEX) .setRefreshPolicy(WAIT_UNTIL) @@ -1193,12 +1193,12 @@ public void testSkipDuplicates() throws Exception { indexRandom(true, indexRequestBuilders); Arrays.sort(termIds, Comparator.comparingInt(o -> weights[(int) o]).reversed().thenComparingInt(a -> (int) a)); - logger.info("Expected terms id ordered {}", (Object[]) termIds); + logger.info("Expected terms id ordered {}", Arrays.toString(termIds)); String[] expected = new String[numUnique]; for (int i = 0; i < termIds.length; i++) { expected[i] = "suggestion-" + String.format(Locale.ENGLISH, "%03d", termIds[i]); } - logger.info("Expected suggestions field values {}", (Object[]) expected); + logger.info("Expected suggestions field values {}", Arrays.toString(expected)); CompletionSuggestionBuilder completionSuggestionBuilder = SuggestBuilders.completionSuggestion(FIELD) .prefix("sugg") .skipDuplicates(true) diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java index a36a028b75e01..e78e9504a3ef7 100644 --- a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java @@ -697,25 +697,35 @@ protected static void checkStaticState(boolean afterClass) throws Exception { assertThat(StatusLogger.getLogger().getLevel(), equalTo(Level.WARN)); synchronized (statusData) { try { - // ensure that there are no status logger messages which would indicate a problem with our Log4j usage; we map the - // StatusData instances to Strings as otherwise their toString output is useless - - final Function statusToString = (statusData) -> { + /* ensure that there are no status logger messages which would indicate a problem with our Log4j usage; we map the + * StatusData instances to Strings as otherwise their toString output is useless + * + * Filter out known Log4j 2.25+ initialization message about default root logger + */ + List filteredStatusData = statusData.stream() + .filter( + status -> status.getMessage() + .getFormattedMessage() + .contains("No Root logger was configured, creating default ERROR-level Root logger") == false + ) + .toList(); + + final Function statusToString = (sd) -> { try (final StringWriter sw = new StringWriter(); final PrintWriter pw = new PrintWriter(sw)) { - pw.print(statusData.getLevel()); + pw.print(sd.getLevel()); pw.print(":"); - pw.print(statusData.getMessage().getFormattedMessage()); + pw.print(sd.getMessage().getFormattedMessage()); - if (statusData.getStackTraceElement() != null) { - final var messageSource = statusData.getStackTraceElement(); + if (sd.getStackTraceElement() != null) { + final var messageSource = sd.getStackTraceElement(); pw.println("Source:"); pw.println(messageSource.getFileName() + "@" + messageSource.getLineNumber()); } - if (statusData.getThrowable() != null) { + if (sd.getThrowable() != null) { pw.println("Throwable:"); - statusData.getThrowable().printStackTrace(pw); + sd.getThrowable().printStackTrace(pw); } return sw.toString(); } catch (IOException ioe) { @@ -724,8 +734,8 @@ protected static void checkStaticState(boolean afterClass) throws Exception { }; assertThat( - statusData.stream().map(statusToString::apply).collect(Collectors.joining("\r\n")), - statusData.stream().map(status -> status.getMessage().getFormattedMessage()).collect(Collectors.toList()), + filteredStatusData.stream().map(statusToString::apply).collect(Collectors.joining("\r\n")), + filteredStatusData.stream().map(status -> status.getMessage().getFormattedMessage()).collect(Collectors.toList()), empty() ); } finally { diff --git a/test/logger-usage/build.gradle b/test/logger-usage/build.gradle index e81cdef04df1f..bdc83adfbc1e6 100644 --- a/test/logger-usage/build.gradle +++ b/test/logger-usage/build.gradle @@ -35,5 +35,6 @@ dependencies { api "org.ow2.asm:asm-tree:${versions.asm}" api "org.ow2.asm:asm-analysis:${versions.asm}" api "org.apache.logging.log4j:log4j-api:${versions.log4j}" + compileOnly "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}" testImplementation project(":test:framework") }