From f1b8c149fe2af23c61b16e1d99401b08916756b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 09:14:22 -0700 Subject: [PATCH] Bump slf4jVersion from 2.0.7 to 2.0.9 (#3272) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../gc-monitor-api/gradle.lockfile | 2 +- .../gc-monitor-core/gradle.lockfile | 2 +- .../agent-alerting/gradle.lockfile | 2 +- agent/agent-tooling/gradle.lockfile | 4 +- dependencyManagement/build.gradle.kts | 2 +- etw/java/gradle.lockfile | 2 +- .../META-INF/LICENSE.txt | 176 ------------------ .../META-INF/LICENSE.txt | 2 +- licenses/more-licenses.md | 14 +- .../slf4j-api-2.0.9.jar/META-INF/LICENSE.txt | 24 +++ 10 files changed, 39 insertions(+), 191 deletions(-) delete mode 100644 licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt rename licenses/{slf4j-api-2.0.7.jar => jcl-over-slf4j-2.0.9.jar}/META-INF/LICENSE.txt (95%) create mode 100644 licenses/slf4j-api-2.0.9.jar/META-INF/LICENSE.txt diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 39d7c0f08c1..9e42e5c0a90 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -11,6 +11,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath -org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.slf4j:slf4j-api:2.0.9=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 39d7c0f08c1..9e42e5c0a90 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -11,6 +11,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath -org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.slf4j:slf4j-api:2.0.9=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 17e31aa7626..d4087ecaddc 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -10,6 +10,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath -org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.slf4j:slf4j-api:2.0.9=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 1b57d34d3d5..aadeaf1d7e4 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -86,7 +86,7 @@ org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath org.hamcrest:hamcrest:2.1=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath -org.slf4j:jcl-over-slf4j:2.0.7=runtimeClasspath -org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.slf4j:jcl-over-slf4j:2.0.9=runtimeClasspath +org.slf4j:slf4j-api:2.0.9=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 0fd0553995e..b3b1995a098 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -40,7 +40,7 @@ val errorProneVersion = "2.21.1" val byteBuddyVersion = "1.12.18" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" -val slf4jVersion = "2.0.7" +val slf4jVersion = "2.0.9" val CORE_DEPENDENCIES = listOf( "com.google.auto.service:auto-service:${autoServiceVersion}", diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 17e31aa7626..d4087ecaddc 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -10,6 +10,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath -org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.slf4j:slf4j-api:2.0.9=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt b/licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt deleted file mode 100644 index 2bb9ad240fa..00000000000 --- a/licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt +++ /dev/null @@ -1,176 +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 \ No newline at end of file diff --git a/licenses/slf4j-api-2.0.7.jar/META-INF/LICENSE.txt b/licenses/jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt similarity index 95% rename from licenses/slf4j-api-2.0.7.jar/META-INF/LICENSE.txt rename to licenses/jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt index e4079f54f6c..1a3d053237b 100644 --- a/licenses/slf4j-api-2.0.7.jar/META-INF/LICENSE.txt +++ b/licenses/jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2004-2023 QOS.ch +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) All rights reserved. Permission is hereby granted, free of charge, to any person obtaining diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 55ed3946de7..c038e14e27a 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2023-08-25 14:44:53 PDT_ +_2023-09-04 03:21:10 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.15.2` @@ -279,12 +279,12 @@ _2023-08-25 14:44:53 PDT_ > - **POM Project URL**: [http://awaitility.org](http://awaitility.org) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**55** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` +**55** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.9` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -> - **Embedded license files**: [jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt) +> - **Embedded license files**: [jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt) ## Eclipse Public License - v 1.0 @@ -401,17 +401,17 @@ _2023-08-25 14:44:53 PDT_ > - **POM Project URL**: [https://github.com/Microsoft/jfr-streaming](https://github.com/Microsoft/jfr-streaming) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**79** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` +**79** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.9` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -> - **Embedded license files**: [jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt) +> - **Embedded license files**: [jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.9.jar/META-INF/LICENSE.txt) -**80** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.7` +**80** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.9` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -> - **Embedded license files**: [slf4j-api-2.0.7.jar/META-INF/LICENSE.txt](slf4j-api-2.0.7.jar/META-INF/LICENSE.txt) +> - **Embedded license files**: [slf4j-api-2.0.9.jar/META-INF/LICENSE.txt](slf4j-api-2.0.9.jar/META-INF/LICENSE.txt) ## MIT-0 diff --git a/licenses/slf4j-api-2.0.9.jar/META-INF/LICENSE.txt b/licenses/slf4j-api-2.0.9.jar/META-INF/LICENSE.txt new file mode 100644 index 00000000000..1a3d053237b --- /dev/null +++ b/licenses/slf4j-api-2.0.9.jar/META-INF/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +