From 9cec3431849c0f8fbd92a157bebf2ea769989f47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 03:38:01 +0000 Subject: [PATCH 1/4] Bump com.azure:azure-identity from 1.15.3 to 1.15.4 Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-identity_1.15.3...azure-identity_1.15.4) --- updated-dependencies: - dependency-name: com.azure:azure-identity dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- agent/agent-tooling/build.gradle.kts | 2 +- agent/agent/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 01219eba4c9..54d218ab58e 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -90,7 +90,7 @@ dependencies { configurations.all { // waiting for azure-identity to be bumped in the Azure SDK BOM - resolutionStrategy.force("com.azure:azure-identity:1.15.3") + resolutionStrategy.force("com.azure:azure-identity:1.15.4") // waiting for json-smart:2.5.2 to be available as a transitive dependency of azure:azure-identity resolutionStrategy.force("net.minidev:json-smart:2.5.2") } diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts index 98c5b8e44ef..5971e355aae 100644 --- a/agent/agent/build.gradle.kts +++ b/agent/agent/build.gradle.kts @@ -223,7 +223,7 @@ configurations { exclude("com.fasterxml.jackson.dataformat", "jackson-dataformat-xml") exclude("com.fasterxml.woodstox", "woodstox-core") // waiting for azure-identity to be bumped in the Azure SDK BOM - resolutionStrategy.force("com.azure:azure-identity:1.15.3") + resolutionStrategy.force("com.azure:azure-identity:1.15.4") // waiting for json-smart:2.5.2 to be available as a transitive dependency of azure:azure-identity resolutionStrategy.force("net.minidev:json-smart:2.5.2") } From d8371772aaf403d8f145c005287ac59497c5beec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 03:38:55 +0000 Subject: [PATCH 2/4] ./gradlew generateLicenseReport --- licenses/more-licenses.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 83a286a3e25..a83c3c7fdfd 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2025-03-10 13:53:59 PDT_ +_2025-03-12 03:38:54 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.18.3` @@ -53,13 +53,13 @@ _2025-03-10 13:53:59 PDT_ > - **POM Project URL**: [https://bitbucket.org/connect2id/nimbus-language-tags](https://bitbucket.org/connect2id/nimbus-language-tags) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**9** **Group:** `com.nimbusds` **Name:** `nimbus-jose-jwt` **Version:** `9.40` +**9** **Group:** `com.nimbusds` **Name:** `nimbus-jose-jwt` **Version:** `10.0.1` > - **Manifest Project URL**: [https://connect2id.com](https://connect2id.com) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM Project URL**: [https://bitbucket.org/connect2id/nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**10** **Group:** `com.nimbusds` **Name:** `oauth2-oidc-sdk` **Version:** `11.18` +**10** **Group:** `com.nimbusds` **Name:** `oauth2-oidc-sdk` **Version:** `11.23` > - **Project URL**: [https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions](https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) > - **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) @@ -350,7 +350,7 @@ _2025-03-10 13:53:59 PDT_ > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**67** **Group:** `com.azure` **Name:** `azure-identity` **Version:** `1.15.3` +**67** **Group:** `com.azure` **Name:** `azure-identity` **Version:** `1.15.4` > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) @@ -382,7 +382,7 @@ _2025-03-10 13:53:59 PDT_ > - **Manifest License**: "SPDX-License-Identifier: MIT";link="https://opensource.org/licenses/MIT" (Not Packaged) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**75** **Group:** `com.microsoft.azure` **Name:** `msal4j` **Version:** `1.19.0` +**75** **Group:** `com.microsoft.azure` **Name:** `msal4j` **Version:** `1.19.1` > - **Project URL**: [https://github.com/AzureAD/microsoft-authentication-library-for-java](https://github.com/AzureAD/microsoft-authentication-library-for-java) > - **Manifest License**: "MIT License" (Not Packaged) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) From e4bf7f59b62f8c35e722631689808f57b4b1607e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 03:38:58 +0000 Subject: [PATCH 3/4] ./gradlew resolveAndLockAll --write-locks --- agent/agent-tooling/gradle.lockfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 40282926bdc..b97c7ee578e 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -7,7 +7,7 @@ ch.qos.logback:logback-classic:1.3.15=runtimeClasspath ch.qos.logback:logback-core:1.3.15=runtimeClasspath com.azure:azure-core-http-netty:1.15.10=runtimeClasspath com.azure:azure-core:1.55.2=runtimeClasspath -com.azure:azure-identity:1.15.3=runtimeClasspath +com.azure:azure-identity:1.15.4=runtimeClasspath com.azure:azure-json:1.4.0=runtimeClasspath com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0=runtimeClasspath com.azure:azure-sdk-bom:1.2.32=runtimeClasspath @@ -24,11 +24,11 @@ com.github.oshi:oshi-core:6.7.0=runtimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath -com.microsoft.azure:msal4j:1.19.0=runtimeClasspath +com.microsoft.azure:msal4j:1.19.1=runtimeClasspath com.nimbusds:content-type:2.3=runtimeClasspath com.nimbusds:lang-tag:1.7=runtimeClasspath -com.nimbusds:nimbus-jose-jwt:9.40=runtimeClasspath -com.nimbusds:oauth2-oidc-sdk:11.18=runtimeClasspath +com.nimbusds:nimbus-jose-jwt:10.0.1=runtimeClasspath +com.nimbusds:oauth2-oidc-sdk:11.23=runtimeClasspath commons-codec:commons-codec:1.18.0=runtimeClasspath io.netty:netty-bom:4.1.119.Final=runtimeClasspath io.netty:netty-buffer:4.1.119.Final=runtimeClasspath From a72d8aaa42f3cc89d8816c8354a89a97ca54e6d9 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 12 Mar 2025 06:59:29 -0700 Subject: [PATCH 4/4] remove json-smart pinning --- agent/agent-tooling/build.gradle.kts | 2 -- agent/agent/build.gradle.kts | 2 -- 2 files changed, 4 deletions(-) diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 54d218ab58e..f628b7c46ed 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -91,8 +91,6 @@ dependencies { configurations.all { // waiting for azure-identity to be bumped in the Azure SDK BOM resolutionStrategy.force("com.azure:azure-identity:1.15.4") - // waiting for json-smart:2.5.2 to be available as a transitive dependency of azure:azure-identity - resolutionStrategy.force("net.minidev:json-smart:2.5.2") } configurations { diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts index 5971e355aae..3c6ca985c53 100644 --- a/agent/agent/build.gradle.kts +++ b/agent/agent/build.gradle.kts @@ -224,7 +224,5 @@ configurations { exclude("com.fasterxml.woodstox", "woodstox-core") // waiting for azure-identity to be bumped in the Azure SDK BOM resolutionStrategy.force("com.azure:azure-identity:1.15.4") - // waiting for json-smart:2.5.2 to be available as a transitive dependency of azure:azure-identity - resolutionStrategy.force("net.minidev:json-smart:2.5.2") } }