diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index fac54d233cd9..7b80f29a0cb0 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1") implementation("com.google.guava:guava:33.4.8-jre") implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") - implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9") + implementation("com.gradleup.shadow:shadow-gradle-plugin:9.0.1") implementation("org.apache.httpcomponents:httpclient:4.5.14") implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1") implementation("org.owasp:dependency-check-gradle:12.1.3") diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index c83d456eb449..84e13b4b8931 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1" - classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.9" + classpath "com.gradleup.shadow:shadow-gradle-plugin:9.0.1" classpath "io.opentelemetry.instrumentation:gradle-plugins:2.19.0-alpha-SNAPSHOT" } } diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index f780d6fb2404..aa29c61a2ade 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -10,7 +10,7 @@ plugins { into a single jar. See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin. */ - id "com.gradleup.shadow" version "8.3.9" + id "com.gradleup.shadow" version "9.0.1" id "com.diffplug.spotless" version "7.2.1" id "io.opentelemetry.instrumentation.muzzle-generation" version "2.19.0-alpha-SNAPSHOT" diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 1803dd14fed4..11819a2800a4 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}") implementation("org.apache.maven:maven-aether-provider:3.3.9") - implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9") + implementation("com.gradleup.shadow:shadow-gradle-plugin:9.0.1") testImplementation("org.assertj:assertj-core:3.27.4") diff --git a/licenses/licenses.md b/licenses/licenses.md index 7cda22cd36ba..cf7db91f6171 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -285,49 +285,37 @@ > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -## MIT License - -**62** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.17` -> - **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.17.jar/META-INF/LICENSE.txt](slf4j-api-2.0.17.jar/META-INF/LICENSE.txt) - -**63** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.17` -> - **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-simple-2.0.17.jar/META-INF/LICENSE.txt](slf4j-simple-2.0.17.jar/META-INF/LICENSE.txt) - ## The 3-Clause BSD License -**64** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.8` +**62** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **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**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**65** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.8` +**63** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **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**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**66** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.8` +**64** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **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**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**67** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.8` +**65** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **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**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**68** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.8` +**66** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) diff --git a/licenses/slf4j-api-2.0.17.jar/META-INF/LICENSE.txt b/licenses/slf4j-api-2.0.17.jar/META-INF/LICENSE.txt deleted file mode 100644 index 1a3d053237be..000000000000 --- a/licenses/slf4j-api-2.0.17.jar/META-INF/LICENSE.txt +++ /dev/null @@ -1,24 +0,0 @@ -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. - - - diff --git a/licenses/slf4j-simple-2.0.17.jar/META-INF/LICENSE.txt b/licenses/slf4j-simple-2.0.17.jar/META-INF/LICENSE.txt deleted file mode 100644 index 1a3d053237be..000000000000 --- a/licenses/slf4j-simple-2.0.17.jar/META-INF/LICENSE.txt +++ /dev/null @@ -1,24 +0,0 @@ -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. - - -