Skip to content

Commit b05a768

Browse files
trasktrask
authored
Merge branch 'main' into dependabot/gradle/errorProneVersion-2.41.0
2 parents 8ba6794 + 15a0104 commit b05a768

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

‎agent/agent-tooling/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencies {
8989

9090
configurations.all {
9191
// waiting for azure-identity to be bumped in the Azure SDK BOM
92-
resolutionStrategy.force("com.azure:azure-identity:1.16.2")
92+
resolutionStrategy.force("com.azure:azure-identity:1.16.3")
9393
}
9494

9595
configurations {

‎agent/agent-tooling/gradle.lockfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ch.qos.logback:logback-classic:1.3.15=runtimeClasspath
77
ch.qos.logback:logback-core:1.3.15=runtimeClasspath
88
com.azure:azure-core-http-netty:1.15.12=runtimeClasspath
99
com.azure:azure-core:1.55.4=runtimeClasspath
10-
com.azure:azure-identity:1.16.2=runtimeClasspath
10+
com.azure:azure-identity:1.16.3=runtimeClasspath
1111
com.azure:azure-json:1.5.0=runtimeClasspath
1212
com.azure:azure-monitor-opentelemetry-autoconfigure:1.2.0=runtimeClasspath
1313
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
@@ -24,11 +24,11 @@ com.github.oshi:oshi-core:6.8.2=runtimeClasspath
2424
com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
2525
com.google.errorprone:error_prone_annotations:2.41.0=runtimeClasspath
2626
com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath
27-
com.microsoft.azure:msal4j:1.21.0=runtimeClasspath
27+
com.microsoft.azure:msal4j:1.22.0=runtimeClasspath
2828
com.nimbusds:content-type:2.3=runtimeClasspath
2929
com.nimbusds:lang-tag:1.7=runtimeClasspath
30-
com.nimbusds:nimbus-jose-jwt:10.0.1=runtimeClasspath
31-
com.nimbusds:oauth2-oidc-sdk:11.23=runtimeClasspath
30+
com.nimbusds:nimbus-jose-jwt:10.0.2=runtimeClasspath
31+
com.nimbusds:oauth2-oidc-sdk:11.23.1=runtimeClasspath
3232
commons-codec:commons-codec:1.19.0=runtimeClasspath
3333
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
3434
io.netty:netty-buffer:4.2.3.Final=runtimeClasspath
@@ -79,8 +79,8 @@ net.java.dev.jna:jna-platform:5.17.0=runtimeClasspath
7979
net.java.dev.jna:jna:5.17.0=runtimeClasspath
8080
net.minidev:accessors-smart:2.5.2=runtimeClasspath
8181
net.minidev:json-smart:2.5.2=runtimeClasspath
82-
org.apache.commons:commons-lang3:3.17.0=runtimeClasspath
83-
org.apache.commons:commons-text:1.13.1=runtimeClasspath
82+
org.apache.commons:commons-lang3:3.18.0=runtimeClasspath
83+
org.apache.commons:commons-text:1.14.0=runtimeClasspath
8484
org.junit:junit-bom:5.13.4=runtimeClasspath
8585
org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath
8686
org.slf4j:jcl-over-slf4j:2.0.17=runtimeClasspath

‎agent/agent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,6 @@ configurations {
233233
exclude("com.fasterxml.jackson.dataformat", "jackson-dataformat-xml")
234234
exclude("com.fasterxml.woodstox", "woodstox-core")
235235
// waiting for azure-identity to be bumped in the Azure SDK BOM
236-
resolutionStrategy.force("com.azure:azure-identity:1.16.2")
236+
resolutionStrategy.force("com.azure:azure-identity:1.16.3")
237237
}
238238
}

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ val DEPENDENCIES = listOf(
6161
"ch.qos.logback:logback-classic:1.3.15", // logback 1.4+ requires Java 11+
6262
"ch.qos.logback.contrib:logback-json-classic:0.1.5",
6363
"commons-codec:commons-codec:1.19.0",
64-
"org.apache.commons:commons-text:1.13.1",
64+
"org.apache.commons:commons-text:1.14.0",
6565
"com.google.code.gson:gson:2.13.1",
6666
"com.azure:azure-core-test:1.26.2", // this is not included in azure-sdk-bom
6767
"org.assertj:assertj-core:3.27.3",

‎licenses/commons-lang3-3.17.0.jar/META-INF/LICENSE.txt‎ renamed to ‎licenses/commons-lang3-3.18.0.jar/META-INF/LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
you may not use this file except in compliance with the License.
194194
You may obtain a copy of the License at
195195

196-
http://www.apache.org/licenses/LICENSE-2.0
196+
https://www.apache.org/licenses/LICENSE-2.0
197197

198198
Unless required by applicable law or agreed to in writing, software
199199
distributed under the License is distributed on an "AS IS" BASIS,

‎licenses/commons-lang3-3.17.0.jar/META-INF/NOTICE.txt‎ renamed to ‎licenses/commons-lang3-3.18.0.jar/META-INF/NOTICE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Commons Lang
2-
Copyright 2001-2024 The Apache Software Foundation
2+
Copyright 2001-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).

‎licenses/commons-text-1.13.1.jar/META-INF/LICENSE.txt‎ renamed to ‎licenses/commons-text-1.14.0.jar/META-INF/LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
you may not use this file except in compliance with the License.
194194
You may obtain a copy of the License at
195195

196-
http://www.apache.org/licenses/LICENSE-2.0
196+
https://www.apache.org/licenses/LICENSE-2.0
197197

198198
Unless required by applicable law or agreed to in writing, software
199199
distributed under the License is distributed on an "AS IS" BASIS,

‎licenses/commons-text-1.13.1.jar/META-INF/NOTICE.txt‎ renamed to ‎licenses/commons-text-1.14.0.jar/META-INF/NOTICE.txt‎

File renamed without changes.

‎licenses/more-licenses.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# agent
33
## Dependency License Report
4-
_2025-07-25 03:50:10 UTC_
4+
_2025-07-28 20:28:50 UTC_
55
## Apache License, Version 2.0
66

77
**1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.19.2`
@@ -53,13 +53,13 @@ _2025-07-25 03:50:10 UTC_
5353
> - **POM Project URL**: [https://bitbucket.org/connect2id/nimbus-language-tags](https://bitbucket.org/connect2id/nimbus-language-tags)
5454
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
5555
56-
**9** **Group:** `com.nimbusds` **Name:** `nimbus-jose-jwt` **Version:** `10.0.1`
56+
**9** **Group:** `com.nimbusds` **Name:** `nimbus-jose-jwt` **Version:** `10.0.2`
5757
> - **Manifest Project URL**: [https://connect2id.com](https://connect2id.com)
5858
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
5959
> - **POM Project URL**: [https://bitbucket.org/connect2id/nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt)
6060
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
6161
62-
**10** **Group:** `com.nimbusds` **Name:** `oauth2-oidc-sdk` **Version:** `11.23`
62+
**10** **Group:** `com.nimbusds` **Name:** `oauth2-oidc-sdk` **Version:** `11.23.1`
6363
> - **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)
6464
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
6565
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
@@ -279,19 +279,19 @@ _2025-07-25 03:50:10 UTC_
279279
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
280280
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
281281
282-
**56** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.17.0`
282+
**56** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.18.0`
283283
> - **Project URL**: [https://commons.apache.org/proper/commons-lang/](https://commons.apache.org/proper/commons-lang/)
284284
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
285285
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
286-
> - **Embedded license files**: [commons-lang3-3.17.0.jar/META-INF/LICENSE.txt](commons-lang3-3.17.0.jar/META-INF/LICENSE.txt)
287-
- [commons-lang3-3.17.0.jar/META-INF/NOTICE.txt](commons-lang3-3.17.0.jar/META-INF/NOTICE.txt)
286+
> - **Embedded license files**: [commons-lang3-3.18.0.jar/META-INF/LICENSE.txt](commons-lang3-3.18.0.jar/META-INF/LICENSE.txt)
287+
- [commons-lang3-3.18.0.jar/META-INF/NOTICE.txt](commons-lang3-3.18.0.jar/META-INF/NOTICE.txt)
288288

289-
**57** **Group:** `org.apache.commons` **Name:** `commons-text` **Version:** `1.13.1`
289+
**57** **Group:** `org.apache.commons` **Name:** `commons-text` **Version:** `1.14.0`
290290
> - **Project URL**: [https://commons.apache.org/proper/commons-text](https://commons.apache.org/proper/commons-text)
291291
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
292292
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
293-
> - **Embedded license files**: [commons-text-1.13.1.jar/META-INF/LICENSE.txt](commons-text-1.13.1.jar/META-INF/LICENSE.txt)
294-
- [commons-text-1.13.1.jar/META-INF/NOTICE.txt](commons-text-1.13.1.jar/META-INF/NOTICE.txt)
293+
> - **Embedded license files**: [commons-text-1.14.0.jar/META-INF/LICENSE.txt](commons-text-1.14.0.jar/META-INF/LICENSE.txt)
294+
- [commons-text-1.14.0.jar/META-INF/NOTICE.txt](commons-text-1.14.0.jar/META-INF/NOTICE.txt)
295295

296296
**58** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.17`
297297
> - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org)
@@ -370,7 +370,7 @@ _2025-07-25 03:50:10 UTC_
370370
> - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
371371
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
372372
373-
**71** **Group:** `com.azure` **Name:** `azure-identity` **Version:** `1.16.2`
373+
**71** **Group:** `com.azure` **Name:** `azure-identity` **Version:** `1.16.3`
374374
> - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
375375
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
376376
@@ -402,7 +402,7 @@ _2025-07-25 03:50:10 UTC_
402402
> - **Manifest License**: "SPDX-License-Identifier: MIT";link="https://opensource.org/licenses/MIT" (Not Packaged)
403403
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
404404
405-
**79** **Group:** `com.microsoft.azure` **Name:** `msal4j` **Version:** `1.21.0`
405+
**79** **Group:** `com.microsoft.azure` **Name:** `msal4j` **Version:** `1.22.0`
406406
> - **Project URL**: [https://github.com/AzureAD/microsoft-authentication-library-for-java](https://github.com/AzureAD/microsoft-authentication-library-for-java)
407407
> - **Manifest License**: "MIT License" (Not Packaged)
408408
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)

0 commit comments

Comments
 (0)